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