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