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