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