Merge branch 'upstream_master'

Conflicts:
	recipes/php-agent.rb
Merge branch 'master' into work4