Merge in changes from trunk (mostly to get additional ASCII/RAWASCII tests)
Authored by: david_costanzo 2019-10-05
Parent: [r5027]
Child: [r5029]