Summary of changes: 2f0001b... fix build on secondary arches (cherry-picked from 13afcd4c0 (*) 0827a5f... Merge branch 'master' into f15 (*) This commit already existed in another branch; no separate mail sent