Version 3.5005

Before I get any more reports about object Object
Merge pull request #1111 from waveney/wav29

Version 3.5005
Merge pull request #1112 from eternaldensity/master

3.5005