Add optional requirements in a separate file.
Merge branch 'master' into stable_py3

Conflicts:
	circle.yml