Merge branch 'master' into develop
Fix merging ID bug with duplicate topics dita-ot/dita-ot#1528
Merge pull request #1530 from jelovirt/feature/duplicate_topic_merge

Fix merging ID bug with duplicate topics dita-ot/dita-ot#1528