Merge branch 'capture-plain-text-into-nodes'