Merge branch 'w30_MDL-40627_m26_extramemorylimit' of https://github.com/skodak/moodle