Merge branch 'master' into bug819426-exploitable-crash-bugs-report

Conflicts:
	crashstats/crashstats/views.py