Issue #2034731 by helmo: Fixed Collected code style fixes: $Id$