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