Merge xorg/maint into master.