Mon, 27 Oct 2014 14:15:55 +0100 Florian Pose merge. stable-1.5