Merge in changes from trunk (to get Unicode installer)
Authored by: david_costanzo 2020-01-22
Parent: [r5100]
Child: [r5102]