Merge change 2503

* changes:
  Stop the NANP number formatter from putting dashes in shortcodes.