Merge branch 'MDL-63381_master_v3' of https://github.com/TomoTsuyuki/moodle