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