Fixes #7381. Source-Repo: https://github.com/servo/servo Source-Revision: a0d3c9223f09757124b1520c4f17e94fa8bbe249
close #7112 Source-Repo: https://github.com/servo/servo Source-Revision: a5fbb2f2a6fa79755f975feff2435abb6a5dd0e9
Fix for #6787. I left the commits split up for ease of review, happy to squash when this gets accepted. Source-Repo: https://github.com/servo/servo Source-Revision: 172f046688c600c9f51f8db0380e399f6372fe4d