Issue #1192
Issue #1168
Issue #1194
Issues #1191 and #1195
Topiary and Issue #1190
Version 3.61
Merge pull request #1196 from waveney/wav31

Version 3.61