diff --git a/build/NuSpecs/build/net40/UmbracoCms.targets b/build/NuSpecs/build/net40/UmbracoCms.targets
index 4f56a894b7..02d1ba083f 100644
--- a/build/NuSpecs/build/net40/UmbracoCms.targets
+++ b/build/NuSpecs/build/net40/UmbracoCms.targets
@@ -27,6 +27,10 @@
 	<Copy SourceFiles="%(UmbracoClientFiles.FullPath)"
           DestinationFiles="umbraco_client\%(RecursiveDir)%(Filename)%(Extension)"
           Condition="!Exists('umbraco_client\%(RecursiveDir)%(Filename)%(Extension)')" />
+  </Target>
+	<Copy SourceFiles="%(UmbracoClientFiles.FullPath)"
+          DestinationFiles="umbraco_client\%(RecursiveDir)%(Filename)%(Extension)"
+          Condition="!Exists('umbraco_client\%(RecursiveDir)%(Filename)%(Extension)')" />
   </Target>
   <Target Name="AddUmbracoFilesToOutput">
     <ItemGroup>
diff --git a/build/NuSpecs/build/net45/UmbracoCms.targets b/build/NuSpecs/build/net45/UmbracoCms.targets
index 4f56a894b7..02d1ba083f 100644
--- a/build/NuSpecs/build/net45/UmbracoCms.targets
+++ b/build/NuSpecs/build/net45/UmbracoCms.targets
@@ -27,6 +27,10 @@
 	<Copy SourceFiles="%(UmbracoClientFiles.FullPath)"
           DestinationFiles="umbraco_client\%(RecursiveDir)%(Filename)%(Extension)"
           Condition="!Exists('umbraco_client\%(RecursiveDir)%(Filename)%(Extension)')" />
+  </Target>
+	<Copy SourceFiles="%(UmbracoClientFiles.FullPath)"
+          DestinationFiles="umbraco_client\%(RecursiveDir)%(Filename)%(Extension)"
+          Condition="!Exists('umbraco_client\%(RecursiveDir)%(Filename)%(Extension)')" />
   </Target>
   <Target Name="AddUmbracoFilesToOutput">
     <ItemGroup>
diff --git a/build/NuSpecs/build/net451/UmbracoCms.targets b/build/NuSpecs/build/net451/UmbracoCms.targets
index 4f56a894b7..02d1ba083f 100644
--- a/build/NuSpecs/build/net451/UmbracoCms.targets
+++ b/build/NuSpecs/build/net451/UmbracoCms.targets
@@ -27,6 +27,10 @@
 	<Copy SourceFiles="%(UmbracoClientFiles.FullPath)"
           DestinationFiles="umbraco_client\%(RecursiveDir)%(Filename)%(Extension)"
           Condition="!Exists('umbraco_client\%(RecursiveDir)%(Filename)%(Extension)')" />
+  </Target>
+	<Copy SourceFiles="%(UmbracoClientFiles.FullPath)"
+          DestinationFiles="umbraco_client\%(RecursiveDir)%(Filename)%(Extension)"
+          Condition="!Exists('umbraco_client\%(RecursiveDir)%(Filename)%(Extension)')" />
   </Target>
   <Target Name="AddUmbracoFilesToOutput">
     <ItemGroup>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs
index fc41fd7384..02e695ee30 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs
@@ -63,7 +63,10 @@ function openMemberGroup(id) {
 
         public override void Render(ref XmlTree tree)
         {
-            foreach(string role in Roles.GetAllRoles()) {
+            var roles = Roles.GetAllRoles();
+            Array.Sort(roles);
+
+            foreach(string role in roles) {
 //            MemberGroup[] MemberGroups = MemberGroup.GetAll;
             
 //            for (int i = 0; i < MemberGroups.Length; i++)