added OGC directory
added OGC directory, 2nd attempt
Merging upstream changes into production
Merge branch 'master' into production