fix ERR offset is too big on mac
Merge branch 'master' into signed-binary