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