Fix doc bug, again from prior reversions.
Merge branch 'master' into gh-pages