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