Merge branch 'MDL-39461_dev' of https://github.com/totara/openbadges