sh
Merge remote-tracking branch 'origin' into gh-pages

Conflicts:
	app/sitemap.xml