Merge branch 'MDL-56674-master' of https://github.com/kenneth-hendricks/moodle