Merge branch 'MDL-38973-master' of https://github.com/damyon/moodle