Merge branch 'w35_MDL-35072_m24_mancleanup' of git://github.com/skodak/moodle