#1328: Fix for proper data format in theme object
Merge branch 'SCHOLAR-3.x' of github.com:openscholar/openscholar into master7