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