Merge branch 'MDL-59882-master' of git://github.com/andrewnicols/moodle