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