Upon save sphinx.conf will now also be newly written
Merge remote-tracking branch 'origin/master'