Merge branch 'master' into promethium
authorPriyadi Iman Nurcahyo <priyadi@priyadi.net>
Mon, 16 Jan 2017 18:39:29 +0000 (01:39 +0700)
committerPriyadi Iman Nurcahyo <priyadi@priyadi.net>
Mon, 16 Jan 2017 18:39:29 +0000 (01:39 +0700)

Trivial merge