Never mind, creating a directory under /tmp isn't a very good idea
Merge branch 'master' into vagrant-parallels

Conflicts:
	ansible/local-site-create.yml