Merge remote branch 'origin/xorg/maint' into xorg/master