Merge branch 'master' of C:\Infotex with conflicts.