Merge branch 'MDL-64300' of git://github.com/stronk7/moodle