Merge "Fix typo in Conversion Functions doc" into nyc-dev