Imported changes from new upstream release v2.3.2 twitter/bootstrap@d9b502dfb876c40b0735008bac18049c7ee7b6d2