Make PSR alias fix class definitions.
Merge branch 'master' into leo-work