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