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