composer serf-update
Merge branch 'staging' into fixed_agent

Conflicts:
	composer.phar