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

Fix to ml, diamond recyc and master pope