Merge master into sofia1_masthead

Conflicts:
	public_html/css/main.css