Merge branch 'w24_MDL-37974_m26_manexpire' of git://github.com/skodak/moodle