Fri, 25 Apr 2014 16:42:36 +0200merge stable-1.5
Florian Pose <fp@igh-essen.com> [Fri, 25 Apr 2014 16:42:36 +0200] rev 2556
merge