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