Options bug
Merge pull request #991 from waveney/wav29

Options bug
Merge pull request #992 from eternaldensity/master

Version 3.411