Fri, 13 Jan 2017 16:47:27 +0100merge stable-1.5
Florian Pose <fp@gh.de> [Fri, 13 Jan 2017 16:47:27 +0100] rev 2665
merge