Merge branch 'MDL-54036_master' of https://github.com/liorgil/moodle