Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/stylesheets/application.css.scss