Re-merge to hopefully fix problems (back out original change set that was incorrectly merged)
Re-merge to hopefully fix problems (back out original change set that was incorrectly merged)

--HG--
branch : v1-9

vancepym/ogre,jhu-lcsr-forks/ogre,jhu-lcsr-forks/ogre,vancepym/ogre,jhu-lcsr-forks/ogre,jhu-lcsr-forks/ogre,vancepym/ogre,jhu-lcsr-forks/ogre,vancepym/ogre,vancepym/ogre