Change-Id: I2fcaa0149fb6fbe65a8a0041823abe5c86db3bba
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>