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