Merge in fix for Bug #536.
The fix will be modified for Unicode refactoring, but the tests are worth keeping.
Authored by: david_costanzo 2020-03-29
Parent: [r5161]
Child: [r5163]