Back... TO THE FUTURE!

Brings nyc-support-24.1-dev in sync with master, which was where 24.1
development has previously been occurring.