am 3b3714f4: Merge "Escape underscores"

* commit '3b3714f4a4db3c6a2d707856d5461c19cdcd2ce7':
  Escape underscores