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