Yet more dragonfly
Merge pull request #1239 from waveney/wav31

Yet more dragonfly