am 807f426a: am 29534f62: Update for improved glue.

Merge commit '807f426accfe5b014d4e516653de0c193da82a1a'

* commit '807f426accfe5b014d4e516653de0c193da82a1a':
  Update for improved glue.