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