beremiz

beremiz/docutil/
merged Sergeys changes

2018-03-02, Edouard Tisserant
cc7a46953471