web commit by JeremyReed: escape underscore