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