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