Merge branch 'w51_MDL-37299_m25_manselfprogress' of git://github.com/skodak/moodle