Merge pull request #1924 from benthecarman/handle-coinbase-funding-channel