Code

Merge remote-tracking branch 'mfournier/more-changes-for-5.5.0-3'
authorBernd Zeimetz <bernd@bzed.de>
Thu, 10 Sep 2015 12:53:59 +0000 (14:53 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Thu, 10 Sep 2015 12:53:59 +0000 (14:53 +0200)

Trivial merge