Merge branches 'pxa' and 'orion-fixes1'