Merge branch '1.0'
authorMilian Wolff <mail@milianw.de>
Tue, 21 Feb 2017 08:42:31 +0000 (09:42 +0100)
committerMilian Wolff <mail@milianw.de>
Tue, 21 Feb 2017 08:42:31 +0000 (09:42 +0100)

Trivial merge