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