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