#2175: merged all changes from branch to trunk (preserving the original .csproj-files so that I don't have to change reference and output paths)