#35: update 'sphinxbase' to latest commit
#35: update 'sphinxbase' to latest commit
Merge branches 'master' and 'update_submodules'
#35: resolve merge-conflicts