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