Merge origin/master
Merge origin/master

Conflicts:
	dompdf/lib/fonts/log.htm