Fri, 16 Dec 2011 16:31:40 +0100 Florian Pose merge stable-1.5