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