Upstream patches from Bootstrap.