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