Merge https://github.com/Vallach/IQThucydides
Merge branch 'master' of https://github.com/Vallach/IQThucydides.git

resolving merge