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