[#1946] Upgrade Sphinx to 1.2.3
Upgrade sphinx-rtd-theme to 0.1.6.
[#1946] Fix a couple of Sphinx errors
Merge branch '1946-fix-sphinx-html-build'