fix bug
fix bug
Merge branch 'macoin2.0.0' of https://github.com/vipwzw/bitcoin into macoin2.0.0