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