Merge branch 'w04_MDL-37713_m23_testdir' of git://github.com/skodak/moodle into MOODL...