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