Merge branch 'w13_MDL-26991_20_legacy' of git://github.com/skodak/moodle into MOODLE_...