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