Merge remote-tracking branch 'upstream/master'
Fixed csproj
Merge branch 'master' into ribbons