Update from bitpay/bitcore/master