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