Merge branch 'MDL-62387' of https://github.com/paulholden/moodle into master