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