[#2157] Update Unicode handling in assertions.
Merge master.