Setup PHP temp directory
Merge branch 'master' into vagrant-parallels

Conflicts:
	ansible/local-site-create.yml