Merge remote-tracking branch 'origin/master' into select2-style

[ci skip]

Conflicts:
	app/assets/stylesheets/ui/user-thumbnail.css.scss