Merge branch 'w18_MDL-32587_m23_phpunitindividual' of git://github.com/skodak/moodle