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