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