merge master osgearth