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