Update from pc10003835 (Mo 15. Jul 14:03:24 CEST 2013)
Merge solved