am e6c27a7a: Merge "Fix a typo in the big g_ search/replace."

* commit 'e6c27a7af7a9b13e4e3d3ebd604d28effa9e9322':
  Fix a typo in the big g_ search/replace.