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