Merge branch 'SCHOLAR-3.x' into 2328
Revert "Pushing a fix."
Merge branch '2328' of github.com:openscholar/openscholar into 2328