Fixed: Do not fetch composer.phar when not needed
Merge branch '1.1.x' into develop
Fixed: Wrong option name (merge issue)