Merge branch 'ogre1.9' into tundra2