Merge branch 'MDL-53366-master' of github.com:ankitagarwal/moodle