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