Stop Multiple instances of same Masterpiece
Dragonfly part 2
Merge pull request #1233 from waveney/wav31

Dragonfly and fixes