Merge remote-tracking branch 'origin/master' into v3.4.0-dev

diff --cc _config.yml
index eebe695e220392b65ac97906d4c6abdc118b2fd2,b647b349cdc44a7bdcc396de4f84a911d3ab0be2..67439a76b5674f2f1c70684273e50d32cbd3c290
--- 1/_config.yml
--- 2/_config.yml
+++ b/_config.yml
@@@ -10,15 -10,16 +10,17 @@@ source:           doc
  destination:      _gh_pages
  host:             0.0.0.0
  port:             9001
+ 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 js/carousel.js
Simple merge