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