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