Merge pull request #391 from ariard/2019-11-fix-preimage-collision-onchain