Merge branch 'old-master' into finder-phar-fix