Issue #21682: Replace EditorWindow with mock to eliminate memory leaks.
Patch by Saimadhav Heblikar.
Merge with 3.4
Issue #21682: Replace EditorWindow with mock to eliminate memory leaks.
Patch by Saimadhav Heblikar. (2 head merge)
Merge heads.
Merge with 3.4
whitespace
Merge with 3.4 whitespace
Issue #21683: Add Tix build to the Windows buildbot scripts.
Merge with 3.4
Issue #21515: Fix typo in a comment, thanks Arfrever for the report
Issue #21569: Fix incorrect cross reference
Issue #21569: merge from 3.4