Merge branch 'MDL-75642-master' of https://github.com/BruceGoodGuy/moodle