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