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