Fix to ml, diamond recyc and master pope
Merge pull request #1272 from waveney/wav31

Fix to ml, diamond recyc and master pope
Merge pull request #1273 from eternaldensity/master

Version 3.6601