Merge upstream builder changes from Make 1.4.7
Attempt parity with extras.php
Merge pull request #155 from washingtonstateuniversity/update-make

[PR] Update builder from upstream Make 1.4.7