#866 & #870 - handle comparisons across different window contexts correctly
release 3.6.1
Merge branch 'hotfix/3.6.1'