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