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