Merge branch 'openbadges-fixes' of https://github.com/danpoltawski/moodle