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