initial commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	docs/conf.py
	docs/index.rst
	docs/make.bat