#1463: Update OG to latest Dev, Migrate to 2.5, to Fix Travis.
Merge branch 'SCHOLAR-3.x' into 1480