Merge tag 'upstream/3.052'
authorSven Hoexter <sven@timegate.de>
Mon, 22 Sep 2014 16:13:00 +0000 (18:13 +0200)
committerSven Hoexter <sven@timegate.de>
Mon, 22 Sep 2014 16:13:00 +0000 (18:13 +0200)
Upstream version 3.052


Trivial merge