Fix to CDSP fix and Leaping Panther
Merge pull request #1255 from waveney/wav31

Fix to CDSP fix and Leaping Panther
Merge pull request #1256 from eternaldensity/master

Version 3.6525 Julian YIP