Fledging works again
Merge pull request #1202 from waveney/wav31

Fledging works again
Merge pull request #1203 from eternaldensity/master

 Fledging works again