Merge pull request #579 from ariard/2020-04-sanitize-cltv-delay