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