(remove leftover editorial note)
Merge branch 'master' into for-readthedocs