namespaced
Merge pull request #56 from ozone-development/bug/52/namespaceLocator

namespaced
Merge branch 'develop' of github.com:ozone-development/meridian into research/new-rendering-engine-api

* 'develop' of github.com:ozone-development/meridian:
  namespaced