Updated dependencies
Merge pull request #517 from GrahamCampbell/deps

Updated dependencies

* GrahamCampbell/deps:
  Updated dependencies
Merge branch 'master' into php5

* master:
  Updated dependencies

Conflicts:
	composer.lock