Update from nb10003429 (Mi 2. Jan 16:41:48 CET 2013)
Some dubious merge stuff