Merge in changes from trunk (small fixes to a comment)
Authored by: david_costanzo 2020-07-02
Parent: [r5316]
Child: [r5318]