Avoid baseline alignment for images, and with HTML “height” attribute
“curlrc” from “thee”
Merge commit '6a91f6d' into HEAD

Conflicts:
	curlrc
Restore “site-python” on Debian
Avoid random merge programs in Mercurial
Use MPV
Merge remote-tracking branch 'github' into HEAD

Conflicts:
	curlrc