Merge branch '1.0'
authorMilian Wolff <mail@milianw.de>
Sun, 26 Feb 2017 20:35:54 +0000 (21:35 +0100)
committerMilian Wolff <mail@milianw.de>
Sun, 26 Feb 2017 20:35:54 +0000 (21:35 +0100)

Trivial merge