Moving stuff around
Not working with path_suffixes, testing something else
Merge pull request #2839 from murillodigital/master

LibOVR changes