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