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