Merge tag 'upstream/1.2.5'
authorSven Hoexter <sven@timegate.de>
Wed, 7 Dec 2016 16:55:33 +0000 (17:55 +0100)
committerSven Hoexter <sven@timegate.de>
Wed, 7 Dec 2016 16:55:33 +0000 (17:55 +0100)
Upstream version 1.2.5


Trivial merge