Merge branch 'master' into promethium
authorPriyadi Iman Nurcahyo <priyadi@priyadi.net>
Wed, 8 Feb 2017 18:01:24 +0000 (01:01 +0700)
committerPriyadi Iman Nurcahyo <priyadi@priyadi.net>
Wed, 8 Feb 2017 18:01:24 +0000 (01:01 +0700)

Trivial merge