Coinbase 0.3.1
Merge pull request #7224 from joshbeal/master

Coinbase 0.3.1