Rebase test master

This merge addresses diverged repos that had /build files committed to the repository.