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