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