Ignore SCM folders by default when creating the phar file
Merge branch 'release/2.3.6'