Merge remote-tracking branch 'ThomasWaldmann/sprint-branch' into sprint-branch
unit test for dumping as utf-8 to a file
Fixed a type in a module name.
Merge remote-tracking branch 'mgax/test-for-58d458d' into sprint-branch
Merge branch 'sprint-branch' of https://github.com/mitsuhiko/jinja2 into sprint-branch

Conflicts:
	jinja2/compiler.py