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