fixed autoload
Merge remote-tracking branch 'refs/remotes/origin/v1.9.x'

Conflicts:
	composer.json