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