Merge pull request #2660 from benthecarman/flexible-fee-rate