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