test
Merge branch 'master' of https://github.com/fzumstein/test

Conflicts:
	docs/conf.py
	docs/range.rst