Manually re-added the second part of the reverted commit which seems fine
Manually re-added the second part of the reverted commit which seems fine

--HG--
branch : v1-9

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