am 60da2fc8: Merge "Use a node pointer to identify content-editable fields."

* commit '60da2fc8c03e5c9b57f13fa7316375d14974d5a9':
  Use a node pointer to identify content-editable fields.