undid changes from other branch
Merge branch '6652' of github.com:openscholar/openscholar into 6652