Merge branch 'blender2.7'

intern/cycles/blender/addon/properties.py

@@ -723,7 +723,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
 
     debug_opencl_kernel_single_program: BoolProperty(
         name="Single Program",
-        default=True,
+        default=False,
         update=_devices_update_callback,
     )
     del _devices_update_callback

intern/cycles/util/util_debug.cpp

@@ -132,7 +132,7 @@ void DebugFlags::OpenCL::reset()
 	}
 	/* Initialize other flags from environment variables. */
 	debug = (getenv("CYCLES_OPENCL_DEBUG") != NULL);
-	single_program = (getenv("CYCLES_OPENCL_MULTI_PROGRAM") == NULL);
+	single_program = (getenv("CYCLES_OPENCL_SINGLE_PROGRAM") != NULL);
 }
 
 DebugFlags::DebugFlags()