Merge branch 'master' into extend-topic-filter-915760

Conflicts:
	apps/search/templates/search/results-redesign.html
	apps/search/views.py
	apps/wiki/models.py
	templates/base.html