Merge branch 'master' into fsharp4

Conflicts:
	src/fsharp/FSharp.Core.Unittests/FSharp.Core/PrimTypes.fs

Author: latkin

src/fsharp/FSharp.Core.Unittests/App.xaml

@@ -1,4 +1,4 @@
-<Application xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<Application xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
              x:Class="FSharp.Core.UnitTests.TestApp.App"
              >

src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/App.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <configuration>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />