Wolfgang - 2013-11-23

This is partly fixed in 13.11