Merge remote-tracking branch 'origin/v0.12' into v0.12

Conflicts:
	src/cares_wrap.cc
	src/env-inl.h
	src/env.h
	src/node.cc
	src/node.h
	src/node_crypto.cc

diff --cc lib/path.js
index 44ef0d6,fc5e650..a39031e
--- 1/lib/path.js
--- 2/lib/path.js
+++ b/lib/path.js
@@@ -163,6 -163,11 +163,11 @@@ if (isWindows) 
      resolvedTail = normalizeArray(resolvedTail.split(/[\\\/]+/).filter(f),
                                    !resolvedAbsolute).join('\\');
  
 -     // If device is a drive letter, we'll normalize to lower case.
 -     if (resolvedDevice && resolvedDevice.charAt(1) === ':')
 -       resolvedDevice = resolvedDevice[0].toLowerCase() +
 -        resolvedDevice.substr(1);
++    // If device is a drive letter, we'll normalize to lower case.
++    if (resolvedDevice && resolvedDevice.charAt(1) === ':')
++      resolvedDevice = resolvedDevice[0].toLowerCase() +
++          resolvedDevice.substr(1);
+ 
      return (resolvedDevice + (resolvedAbsolute ? '\\' : '') + resolvedTail) ||
             '.';
    };