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