#1678: apply patch we had before
Merge branch 'SCHOLAR-3.x' of github.com:openscholar/openscholar into master7
Merge branch 'SCHOLAR-3.x' of github.com:openscholar/openscholar into master7