Merge branch 'MDL-55246_unoconv' of https://github.com/Syxton/moodle