Bump version to m5
Bump version to 3.1m4
Bump version to 3.1m5
Merge branch 'master' into CFY-1373-new-ctx-api

Conflicts:
	tests/dev-requirements.txt