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