Whoops, composer.phar, not just composer
Merging in master