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