Merge pull request #1507 from stevepiercy/1.2-branch

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

backport. closes #460, #552