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