Merge pull request #2851 from rpv-tomsk/external-manio-master