Merge tag 'upstream/1.2.3'
authorSven Hoexter <sven@timegate.de>
Tue, 22 Dec 2015 13:15:15 +0000 (14:15 +0100)
committerSven Hoexter <sven@timegate.de>
Tue, 22 Dec 2015 13:15:15 +0000 (14:15 +0100)
Upstream version 1.2.3


Trivial merge