Merge pull request #1506 from stevepiercy/1.3-branch

cherrypick from master, pin Sphinx to 1.2.3