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