Merge branch 'MDL-39825_dev_master' of https://github.com/totara/openbadges