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