Merge branch 'master' into bind-bignum