Merge remote-tracking branch 'upstream/master' into upstream-updates

Conflicts:
	app/assets/javascripts/detail/detail-init.js
	app/assets/javascripts/util/translation/google-translate-manager.js
	app/assets/stylesheets/_base.css.scss
	app/assets/stylesheets/_base.scss
	app/assets/stylesheets/_base.scss.erb
	app/assets/stylesheets/application.css
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/components/_input-search.css.scss
	app/views/component/detail/_location_description.html.haml
	spec/cassettes/page_translation/results_page_is_translated/displays_translated_contents.yml
	spec/features/general/translate_spec.rb
	spec/support/capybara.rb