Merge remote-tracking branch 'upstream/master' into footer-design

Conflicts:
	www/theme.css