Merge branch 'w02_MDL-31005_m23_contextlevelname' of git://github.com/skodak/moodle