Merge branch 'MDL-69411-master' of git://github.com/dravek/moodle