Merge branch 'w20_MDL-32960_m23_phpunitref' of git://github.com/skodak/moodle