Merge branch 'MDL-63710-master' of https://github.com/ilya-catalyst/moodle