issue #2636: fix was incorrect, check for equality, not identity
Merge branch 'release' into upstream