Merge branch 'master' into php5

* master:
  Cleaned up whitespace

Conflicts:
	composer.json