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