Merge remote-tracking branch 'upstream/master'

Conflicts:
	cms/static/sass/elements/_header.scss
	cms/templates/widgets/header.html