Merge branch 'xorg/master' of /home/git/platal into xorg/master