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