Merge branch 'MDL-67886_master' of git://github.com/mdjnelson/moodle