Lots of dragon stuff
Merge pull request #1178 from waveney/wav31

Lots of dragon stuff