Merge branch 'MDL-70110-master' of https://github.com/septatrix/moodle