Merge branch 'w08_MDL-38154_m25_delperf' of git://github.com/skodak/moodle