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