Merge in changes from trunk
This change fixes build breaks when compiled without precompiled headers.
Authored by: david_costanzo 2019-06-29
Parent: [r4963]
Child: [r4965]