cherrypick from master, pin Sphinx to 1.2.3
Merge pull request #1510 from stevepiercy/1.0-branch

cherrypick from master, pin Sphinx to 1.2.3