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