Merge branch 'w23_MDL-33583_m23_keepall' of git://github.com/skodak/moodle