Merge branch 'w41_MDL-28980_m24_expirywarning' of git://github.com/skodak/moodle