Merge branch 'melmott push origin masterhx-warn-on-uri-for'
John Napiorkowski [Thu, 29 Oct 2015 14:58:09 +0000 (09:58 -0500)]

Trivial merge