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