Merge pull request #986 from waveney/wav29

Ninja Tortoise Patches
Merge pull request #987 from waveney/wav29

Tangled Tessaract
Merge pull request #988 from waveney/wav29

Version 3.41
Options bug