Even less Mustard
Issue #952
Merge pull request #955 from waveney/wav28

Wav28