Editorial

Merge content changes into master.