Merge pull request #1508 from stevepiercy/1.1-branch

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

backport. closes #460, #552