Merge branch 'MDL-58643-master' of git://github.com/snake/moodle