Done-with: Andrew Knight <andrew.knight@digia.com>
Done-with: Friedemann Kleint <friedemann.kleint@digia.com>

Change-Id: I4772938e775056d6a36a7e75f868921a74007862
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>