Honour "CP" override in W'

W' calculator didn't use the "CP" metadata to override the
CP for the ride.
merge master into personal