Commiting minor text edits.
Commiting merge.