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