Upstream merge

...es off the minified size.