Fix some trailing spaces
Merge branch 'master' into hyphenation

Conflicts:
	weasyprint/layout/inlines.py