Change-Id: I2321ae9310476f36a1b1fa36509ec92f639ee8a7 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>