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