cli-config.php for doctrine command line tool
Merge remote-tracking branch 'origin/master'