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