* Merged r12008 and r12012 into the 20.03 release branch. No functional change, just to provide source tarballs for Linux distros that don't fail to compile.
Authored by: mortenmacfly 2020-03-31
Parent: [r12012]
Child: [r12014]