Fri, 16 Sep 2016 11:56:53 +0200merge stable-1.5
Florian Pose <fp@igh-essen.com> [Fri, 16 Sep 2016 11:56:53 +0200] rev 2656
merge