Merge branch 'vendor/MDOCML'