Merge pull request #2796 from yellowred/fix/bitcoind_parse_txid