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