diff --git a/indra/develop.py b/indra/develop.py
index 03d1b19bd..7e1d3f1ba 100755
--- a/indra/develop.py
+++ b/indra/develop.py
@@ -749,6 +749,7 @@ class CygwinSetup(WindowsSetup):
 setup_platform = {
     'darwin': DarwinSetup,
     'linux2': LinuxSetup,
+    'linux3': LinuxSetup,
     'win32' : WindowsSetup,
     'cygwin' : CygwinSetup
     }
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index ba2e3f542..d98ef327f 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -34,9 +34,9 @@
 #define LL_LLVERSIONVIEWER_H
 
 const S32 LL_VERSION_MAJOR = 1;
-const S32 LL_VERSION_MINOR = 5;
-const S32 LL_VERSION_PATCH = 10;
-const S32 LL_VERSION_BUILD = 1;
+const S32 LL_VERSION_MINOR = 6;
+const S32 LL_VERSION_PATCH = 0;
+const S32 LL_VERSION_BUILD = 0;
 
 const char * const LL_CHANNEL = "Singularity";
 
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 3cb5445cd..5234b8f3e 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -436,7 +436,7 @@
   	<key>Type</key>
   	<string>String</string>
   	<key>Value</key>
-  	<string>secondlife</string>
+  	<string>Second Life</string>
   </map>
 
   <key>VivoxLicenseAccepted</key>
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index ba88d237a..11e310cb9 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -372,7 +372,7 @@ bool idle_startup()
 	static U64 first_sim_handle = 0;
 	static LLHost first_sim;
 	static std::string first_sim_seed_cap;
-	static U32 first_sim_size_x = 256;
+	static U32 first_sim_size_x = 256;
 	static U32 first_sim_size_y = 256;
 
 	static LLVector3 initial_sun_direction(1.f, 0.f, 0.f);