Merge branch 'master' into v3.4.0-dev

diff --cc _config.yml
index c62ac5c7635c4365a68f788ce918e50ce4bc2ce2,b647b349cdc44a7bdcc396de4f84a911d3ab0be2..2b60da81b47399c9d2330aa3c1b6acc8899cee11
--- 1/_config.yml
--- 2/_config.yml
+++ b/_config.yml
@@@ -9,16 -9,17 +9,18 @@@ permalink:        prett
  source:           docs
  destination:      _gh_pages
  host:             0.0.0.0
 -port:             9001
 +port:             3001
+ baseurl:          ""
  url:              http://getbootstrap.com
 +baseurl:          /docs/3.4
  encoding:         UTF-8
  
  gems:
    - jekyll-sitemap
  
  # Custom vars
 -current_version:  3.3.7
 -docs_version:     3.3
 +current_version:  3.4.0
++docs_version:     3.4
  repo:             https://github.com/twbs/bootstrap
  sass_repo:        https://github.com/twbs/bootstrap-sass
  

diff --cc docs/_includes/footer.html
Simple merge

diff --cc js/carousel.js
Simple merge