Steffen Macke - 2012-02-23

Requested also in #3491545