Merge branch 'w04_MDL-31181_m23_fitlertestcfg' of git://github.com/skodak/moodle