Backport #589
Merge branch '0.9-maintenance'

Conflicts:
	werkzeug/urls.py