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