Merge branch 'master' of https://github.com/snowleopard/hadrian
authorAndrey Mokhov <andrey.mokhov@gmail.com>
Sat, 19 Aug 2017 02:45:40 +0000 (03:45 +0100)
committerAndrey Mokhov <andrey.mokhov@gmail.com>
Sat, 19 Aug 2017 02:45:40 +0000 (03:45 +0100)

Trivial merge