Merge pull request #1083 from TheBlueMatt/2021-09-funding-timeout