Change-Id: If6d7acb362433814dd73819ec224249f05ab9dcd Reviewed-by: Daniel Teske <daniel.teske@digia.com>