Change-Id: I9aae36188ed11d0a7211dbe3e079d4c0fc2ab272 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>