openscholar/openscholar — pull request #5381 by baisong (2014-02-20 20:41:05+00:00)
Title: Squash and cherry-pick PR #4811 #4731

#4731

See also #4811