Merge branch 'w03_MDL-31053_m23_contextpreloading' of git://github.com/skodak/moodle