fixes #9556
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip