Merge branch 'MDL-65448-master' of git://github.com/lucaboesch/moodle