Merge branch 'w47_MDL-36701_m24_composer' of git://github.com/skodak/moodle