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