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