Upstream commit 3942a116e4 This merge also includes a few Decred specific modifications and corrects some old btcjson references that should have been updated to dcrjson.
3942a116e4