Merge branch 'master' into add-tags

Conflicts:
	lib/vagrant-google/action/run_instance.rb