Merge branch 'w51_MDL-37297_m25_enrolcatprogress' of git://github.com/skodak/moodle