Cherry-pick "Merge branch 'PPC64-fixes-master-20181207' into 'master'" into 1.0
PowerPC Fixes, master branch (2018.12.12.)
See merge request !401 (merged)
(cherry picked from commit c72178d0)
PowerPC Fixes, master branch (2018.12.12.)
See merge request !401 (merged)
(cherry picked from commit c72178d0)