Merge pull request #249 from stevenroose/bitcoin-0.15