Merge pull request #2038 from jmcclelland/honor-roll-4.4