Merge branch 'w33_MDL-41112_m26_cachedist' of https://github.com/skodak/moodle