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