Merge branch 'MDL-69993' of git://github.com/paulholden/moodle into master