Merge "URLs are hard, Mr. Eason. am: 9938f2b am: 6c5079b am: d4a4f43" into nyc-dev