Do not use environ variables
Merge branch 'optionable-php-platform'