fix nested containers (addresses some of #13682)
Merge branch 'master' of github.com:twbs/bootstrap