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