accidental merge

[Tilman Hausherr]

Hi all,

I made an accidental merge and I tried to revert it, but I suspect I 
made it worse. Still working on it...

Tilman