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