Merge branch 'w25_MDL-40210_m25_badgescaps' of git://github.com/skodak/moodle into...