Merge upgrades from bitpay/insight-api/master