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