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