Merge branch '3215' of github.com:openscholar/openscholar into 3215.
Fix them.
Merge branch '3215' of github.com:openscholar/openscholar into 3215.