cherrypick from master, pin Sphinx to 1.2.3