fixes #10890
Merge branch 'master' of github.com:twbs/bootstrap