Merge branch 'MDL-65310-master' of https://github.com/tsmilan/moodle