Merge branch 'w13_MDL-26987_21_sclean' of git://github.com/skodak/moodle