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