Change-Id: Iebe27d2d4d08fde62398cd711ad557f16a6f3974
Reviewed-by: Christian Stenger <christian.stenger@digia.com>