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