rebuild osops
Merge branch '6679' of github.com:openscholar/openscholar into 6679