Pulled in upstream commits to PhantomCSS