Update dev-requirements.txt
Merge branch 'master' into CFY-1373-new-ctx-api

Conflicts:
	tests/dev-requirements.txt