Merge branch 'MDL-68592-master' of https://github.com/kabalin/moodle