Merged the upstream master changes in hopes of getting the build to pass.