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