Merge branch 'MOODLE_39_MDL-69358' of https://github.com/golenkovm/moodle into MOODLE...