Summary of changes: d8dec59... fix build on aarch64 (#973343), fix the defines for arm and (*) 9c9ec64... Merge branch 'master' into f19 (*) This commit already existed in another branch; no separate mail sent