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