Merge branch 'master' of C:\temp\prophit with conflicts.
fix ci