Add regression test re #581
Merge branch '1.5'