Trying to reproduce #75 in a small test case
Interim check-in: figuring out what's going on
Possible fix for issue #75
Merge branch 'master' into issue-75