Ensured external build in "make.sh" and commented out test.
Merge remote-tracking branch 'origin/master'