Merge branch 'master' of https://github.com/snowleopard/hadrian
authorAndrey Mokhov <andrey.mokhov@gmail.com>
Thu, 16 Mar 2017 00:42:05 +0000 (00:42 +0000)
committerAndrey Mokhov <andrey.mokhov@gmail.com>
Thu, 16 Mar 2017 00:42:05 +0000 (00:42 +0000)

Trivial merge