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