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