Bernhard Firner - 2012-06-11

Should be fixed with commit 2a488502fbcbc9251c6f654cb2ed2476c190cc96
Needs to be tested against a busy server.