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