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