MDL-30414 block_private_files: convert button to inline link
MDL-46639 SCORM: incorrect setting of launch param, it is done in scorm_parse_aicc
Merge branch 'm26_MDL-46639' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE
MDL-47031 Merge English strings from the en_fix language pack
Merge branch 'MDL-47031-26-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_26_STABLE