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