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