Bring in updated build script from master