Merge changes from trunk (fixes to typos in manual)
Authored by: david_costanzo 2020-06-05
Parent: [r5272]
Child: [r5274]