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