hai

hai
Merge remote-tracking branch 'origin/master'

Conflicts:
	vendor/autoload.php
	vendor/composer/autoload_real.php