Merge remote-tracking branch 'danstowell/browsepage' into next

Conflicts:
	config/locales/sv.yml