Fix to Issue #253
Merge pull request #254 from waveney/Waveney

Fix to Issue #253
changelog 3.15