Merge branch 'xorg/master' into xorg/f/geocoding