Merge branch 'Catalina' into gh-pages

Conflicts:
	css/stampa.css