Merge branch 'master' of C:\Infotex with conflicts.
Merge branch 'master' of C:\Infotex with conflicts.
Merge branch 'Evgenii' of https://github.com/Kreisfahrer/Infotex into Evgenii