am 446d2ba4: Merge "Properly quote <username>"

* commit '446d2ba43f4e0835cc81092d0b4476b01b92fa2a':
  Properly quote <username>