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