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