Update build/install scripts
Merge branch 'master' into macosx.travis