Commited patch from Björn Steinbrink: