Merge branch 'MDL-65318-master' of git://github.com/lameze/moodle