Merge branch 'w51_MDL-30613_m23_FULLME' of git://github.com/skodak/moodle