Update dependency restrictions
Merge branch 'hhvm'

Conflicts:
	composer.json