Merge branch 'MDL-58684-master-2' of https://github.com/snake/moodle