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