Merge branch 'master' into hummingbird

Conflicts:
	app/assets/javascripts/discourse/views/application_view.js