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