Add a repro of #31
Merge branch '2.4'