Tue, 10 Apr 2012 19:10:56 +0200 Florian Pose merge. stable-1.5