Again turned into a standalone exception, that does not depend upon josef.
Authored by: keess 2011-09-14
Parent: [r2323]
Child: [r2325]
