Merge pull request #1505 from stevepiercy/1.4-branch

cherrypick from master, pin Sphinx to 1.2.3