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