Merge branch 'pxa' into devel