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