Merge pull request #3127 from alexrp/arm32-on-arm64