This change was backported
Ensure we don't accidentally pick up new tasks.py for tests
Merge branch '1.7' into 1.8

Conflicts:
	sites/www/changelog.rst
Merge branch '1.8'