Merge "take account of RotationVector's new extra parameter"