Merge branch 'MDL-65852-master' of git://github.com/ilya-catalyst/moodle