desktop
Merge remote-tracking branch 'origin/3.9.1' into 3.9.1

Conflicts:

	SharePointProject1/SharePointProject1/VisualWebPart1/VisualWebPart1.webpart