Merge remote-tracking branch 'sparc/master' into work.sparc32