Merge pull request #1504 from stevepiercy/1.5-branch

cherrypick from master pin Sphinx to 1.2.3