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