Fri, 18 Dec 2015 12:30:45 +0100merge stable-1.5
Florian Pose <fp@igh-essen.com> [Fri, 18 Dec 2015 12:30:45 +0100] rev 2632
merge