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