Merge tag 'upstream/1.2.4'
authorSven Hoexter <sven@timegate.de>
Sat, 25 Jun 2016 12:12:44 +0000 (14:12 +0200)
committerSven Hoexter <sven@timegate.de>
Sat, 25 Jun 2016 12:12:44 +0000 (14:12 +0200)
Upstream version 1.2.4


Trivial merge