Merge branch 'MDL-34883_unit_tests_23' of git://github.com/andyjdavis/moodle into...