fix build.sh
Merge remote-tracking branch 'darkf/master'
Merging darkf with master hopefully to revert master to be concurrent
with darkf's repo master branch.
trying to reset my maste rbranch
Merge branch 'master' into darkf3