Update circle.yml yet again.
Merge branch 'master' into stable_py3

Conflicts:
	circle.yml