Bugfix in rebase function.
Bugfix in rebase function.
RTD work-around in conf.py
Version update in conf.py
Merge branch 'master' into xlrd

Include the bugfix in master into xlrd
xlrd code taking form