Merge branch 'MDL-49845-fix-master' of git://github.com/gurgus/moodle