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