Merge branch 'modversions' (modversions fixes for powerpc from Ard)