Change the version to 2.3 in the docs.
Merge branch 'rbarlow-2.3_doc_versions'
Merge branch 'master' into distributed-tasks

Conflicts:
	docs/sphinx/dev-guide/conf.py
	docs/sphinx/user-guide/conf.py