Merge tag 'upstream/1.2.2'
authorSven Hoexter <sven@timegate.de>
Sun, 6 Dec 2015 13:38:24 +0000 (14:38 +0100)
committerSven Hoexter <sven@timegate.de>
Sun, 6 Dec 2015 13:38:24 +0000 (14:38 +0100)
Upstream version 1.2.2


Trivial merge