fixes #8864
fixes #8892
Merge branch '3.0.0-wip' of https://github.com/twbs/bootstrap into develop