Docblock changes and psr-4 autoloader changes for composer