Update composer.json
Merge remote-tracking branch 'origin/master' into namespace-php5.3

Conflicts:
	samples/composer.json