Merge remote-tracking branch 'origin/master' into vagrant-ubuntu-lts-precise64
apiv2 changes
Merge remote-tracking branch 'origin/master' into vagrant-ubuntu-lts-precise64
off alias
Merge remote-tracking branch 'origin/vagrant-ubuntu-lts-precise64'