Merge remote-tracking branch 'upstream/master'

.travis.yml

@@ -2,6 +2,9 @@ language: ruby
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq -y bsdtar
+  - rvm @global do gem uninstall bundler --all --executables
+  - gem uninstall bundler --all --executables
+  - gem install bundler --version '< 1.7.0'
 rvm:
   - 2.0.0
 env:

website/docs/source/v2/share/http.html.md

@@ -12,7 +12,7 @@ sharing," and is enabled by default when `vagrant share` is used.
 Because this mode of sharing creates a publicly accessible URL, the accessing
 party does not need to have Vagrant installed in order to view your environment.
 
-This has a number of useful use cases: you can test webooks by exposing
+This has a number of useful use cases: you can test webhooks by exposing
 your Vagrant environment to the internet, you can show your work to clients,
 teammates, or managers, etc.