Mon, 27 Oct 2014 14:15:55 +0100merge. stable-1.5
Florian Pose <fp@igh-essen.com> [Mon, 27 Oct 2014 14:15:55 +0100] rev 2562
merge.