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