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