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