Merge branch 'MDL-58699-master' of git://github.com/damyon/moodle