fix #10986
Merge branch 'master' of https://github.com/twbs/bootstrap