Merge changes to inc/builder/ files from upstream - Make 1.0.10:
Merge pull request #48 from washingtonstateuniversity/update/make-1.0.10

[PR] Merge changes to inc/builder/ files from upstream - Make 1.0.10