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