Merge remote-tracking branch 'mz2/master'

Latest work from mz2's branch: https://github.com/mz2/JSONKit specifically arm64 support