Merge branch 'w13_MDL-26991_21_legacy' of git://github.com/skodak/moodle