PR for #1971 against 3.4.
Merge pull request #2102 from openscholar/SCHOLAR-3.4-1971

PR for #1971 against 3.4. Only failure was stats.