Merge "Escape underscores"