#1463: Update OG to latest Dev, Migrate to 2.5, to Fix Travis.