Merge in changes from trunk to get fix for build break on 64-bit GNU/Linux
Authored by: david_costanzo 2020-04-19
Parent: [r5220]
Child: [r5222]