Merge branch '1.0'
authorMilian Wolff <milian.wolff@kdab.com>
Wed, 22 Feb 2017 12:40:40 +0000 (13:40 +0100)
committerMilian Wolff <milian.wolff@kdab.com>
Wed, 22 Feb 2017 12:40:40 +0000 (13:40 +0100)

Trivial merge