Merge branch 'MDL-68542-39' of https://github.com/JayChurchward/moodle