Merge branch 'MDL-39697' of git://github.com/lazydaisy/moodle