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