Merge branch 'MDL-62621-master-ixcomment' of git://github.com/mudrd8mz/moodle