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