Merge in changes from trunk, mostly to get updates to files.cpp
Authored by: david_costanzo 2020-01-21
Parent: [r5096]
Child: [r5098]