Update to OG-2.6
Merge pull request #5588 from openscholar/og-2.6

Update to OG-2.6