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