Pull in the patch from the submitted pull request to upstream to fix the unit test data that doesn't tolerate floating point approximation. - Unbreaks aarch64-linux - Fixes the build for aarch64-darwin