Merge branch 'master' into promethium
authorPriyadi Iman Nurcahyo <priyadi@priyadi.net>
Thu, 23 Feb 2017 11:11:59 +0000 (18:11 +0700)
committerPriyadi Iman Nurcahyo <priyadi@priyadi.net>
Thu, 23 Feb 2017 11:11:59 +0000 (18:11 +0700)

Trivial merge