Merge branch 'MDL-45379' of https://github.com/totara/openbadges