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