Imported OGM from main project.
Merge pull request #1 from adurieux/staging

Imported OGM from main project.