Pylons/pyramid — pull request #1504 by stevepiercy (2014-12-27 06:08:14+00:00)
Title: cherrypick from master pin Sphinx to 1.2.3

Fixes #669 and #1068