Merge some typo fixes from trunk.
Authored by: david_costanzo 2019-06-03
Parent: [r4950]
Child: [r4952]