Nicer comment.
Merge branch '5481' of github.com:openscholar/openscholar into 5481
Simpler condition.