Bugfix: proper phar alias handling
Merge branch 'release/2.3.5'