Merge branch 'w22_MDL-33293_m23_revisions' of git://github.com/skodak/moodle