Fix braino in setup.py after updating a link
Add jinja2 to test_requires, closes #1167
Merge branch '1.7' into 1.8

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

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