MDL-30414 block_private_files: convert button to inline link
MDL-39929 Assignment: provide file upload area for assignment description
Merge branch 'MDL-39929' of https://github.com/bostelm/moodle
Merge branch 'wip-MDL-30414-master' of https://github.com/mackensen/moodle
MDL-44725 dml: added sql_intersect()
MDL-47031 Merge English strings from the en_fix language pack
MDL-46639 SCORM: incorrect setting of launch param, it is done in scorm_parse_aicc
Merge branch 'master_MDL-46639' of git://github.com/danmarsden/moodle
Merge branch 'MDL-47031-master-enfix' of git://github.com/mudrd8mz/moodle