Merge branch 'xorg/maint' into xorg/1.0.2/master