Ogre october

Merging changes with master