Merge branch 'w35_MDL-41022_m26_unittests3' of https://github.com/skodak/moodle