Fix comments.
Merge branch '4814' of github.com:openscholar/openscholar into 4814