Merge branch 'SCHOLAR-3.x' into 2603-remove-p-label-from-phone
Merge branch '2603-remove-p-label-from-phone' of github.com:openscholar/openscholar into 2603-remove-p-label-from-phone