Merge branch 'w51_MDL-30761_m23_slowmysql' of git://github.com/skodak/moodle