Edit: Done. Needs approval by sriegl.