Merge branch 'MDL-66915-master' of https://github.com/MartinGauk/moodle