ca805e6 Merge builder.py changes from master, pt2

Authored and Committed by frostyx 7 years ago
    Merge builder.py changes from master, pt2
    
    * 9f017c7 (origin/argument-typofix) Further typofix.
    * 1ec28cd Typo in the argument name here.