Merge branch 'MDL-68866-master' of https://github.com/mchurchward/moodle