diff --git a/CHANGELOG.md b/CHANGELOG.md
index f84cf9ecb..aa8665ce7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## [0.11.5](https://github.com/nodegit/nodegit/releases/tag/v0.11.5) (2016-02-25)
+
+[Full Changelog](https://github.com/nodegit/nodegit/compare/v0.11.4...v0.11.5)
+
+- Fixed crash when calculating a diff [PR #922](https://github.com/nodegit/nodegit/pull/922)
+- Fixed an issue with return values getting randomly corrupted [PR #923](https://github.com/nodegit/nodegit/pull/923)
+
 ## [0.11.4](https://github.com/nodegit/nodegit/releases/tag/v0.11.4) (2016-02-24)
 
 [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.11.3...v0.11.4)
diff --git a/README.md b/README.md
index ed8126910..b7caa80ec 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ NodeGit
   </tbody>
 </table>
 
-**Stable: 0.11.4**
+**Stable: 0.11.5**
 
 ## Have a problem? Come chat with us! ##
 
diff --git a/generate/templates/partials/convert_from_v8.cc b/generate/templates/partials/convert_from_v8.cc
index fc85edf7d..659e2fb0e 100644
--- a/generate/templates/partials/convert_from_v8.cc
+++ b/generate/templates/partials/convert_from_v8.cc
@@ -69,18 +69,10 @@
     {%endif%}
   }
   else {
-    {%if cType|isDoublePointer %}
-    from_{{ name }} = Nan::ObjectWrap::Unwrap<{{ cppClassName }}>(info[{{ jsArg }}]->ToObject())->GetRefValue();
-    {%else%}
-    from_{{ name }} = Nan::ObjectWrap::Unwrap<{{ cppClassName }}>(info[{{ jsArg }}]->ToObject())->GetValue();
-    {%endif%}
+    {%if cType|isDoublePointer %}*{%endif%}from_{{ name }} = Nan::ObjectWrap::Unwrap<{{ cppClassName }}>(info[{{ jsArg }}]->ToObject())->GetValue();
   }
   {%else%}
-    {%if cType|isDoublePointer %}
-  from_{{ name }} = Nan::ObjectWrap::Unwrap<{{ cppClassName }}>(info[{{ jsArg }}]->ToObject())->GetRefValue();
-    {%else%}
-  from_{{ name }} = Nan::ObjectWrap::Unwrap<{{ cppClassName }}>(info[{{ jsArg }}]->ToObject())->GetValue();
-    {%endif%}
+    {%if cType|isDoublePointer %}*{%endif%}from_{{ name }} = Nan::ObjectWrap::Unwrap<{{ cppClassName }}>(info[{{ jsArg }}]->ToObject())->GetValue();
   {%endif%}
 
   {%if isBoolean %}
diff --git a/generate/templates/templates/class_content.cc b/generate/templates/templates/class_content.cc
index 969e88473..bda244812 100644
--- a/generate/templates/templates/class_content.cc
+++ b/generate/templates/templates/class_content.cc
@@ -109,10 +109,6 @@ using namespace node;
     return this->raw;
   }
 
-  {{ cType }} **{{ cppClassName }}::GetRefValue() {
-    return this->raw == NULL ? NULL : &this->raw;
-  }
-
   void {{ cppClassName }}::ClearValue() {
     this->raw = NULL;
   }
diff --git a/generate/templates/templates/class_header.h b/generate/templates/templates/class_header.h
index a378f11a5..11316c51f 100644
--- a/generate/templates/templates/class_header.h
+++ b/generate/templates/templates/class_header.h
@@ -44,7 +44,6 @@ class {{ cppClassName }} : public Nan::ObjectWrap {
 
     {%if cType%}
     {{ cType }} *GetValue();
-    {{ cType }} **GetRefValue();
     void ClearValue();
 
     static Local<v8::Value> New(void *raw, bool selfFreeing);
diff --git a/generate/templates/templates/struct_content.cc b/generate/templates/templates/struct_content.cc
index e2e399d98..b6ab0f16b 100644
--- a/generate/templates/templates/struct_content.cc
+++ b/generate/templates/templates/struct_content.cc
@@ -62,7 +62,7 @@ using namespace std;
       {% endif %}
     {% endif %}
   {% endeach %}
-  
+
   if (this->selfFreeing) {
     free(this->raw);
   }
@@ -143,10 +143,6 @@ Local<v8::Value> {{ cppClassName }}::New(void* raw, bool selfFreeing) {
   return this->raw;
 }
 
-{{ cType }} **{{ cppClassName }}::GetRefValue() {
-  return this->raw == NULL ? NULL : &this->raw;
-}
-
 void {{ cppClassName }}::ClearValue() {
   this->raw = NULL;
 }
diff --git a/generate/templates/templates/struct_header.h b/generate/templates/templates/struct_header.h
index c1f30cc4e..d15bf677c 100644
--- a/generate/templates/templates/struct_header.h
+++ b/generate/templates/templates/struct_header.h
@@ -29,7 +29,6 @@ class {{ cppClassName }} : public Nan::ObjectWrap {
     static void InitializeComponent (Local<v8::Object> target);
 
     {{ cType }} *GetValue();
-    {{ cType }} **GetRefValue();
     void ClearValue();
 
     static Local<v8::Value> New(void *raw, bool selfFreeing);
diff --git a/package.json b/package.json
index c7bab17cb..ab30d68af 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nodegit",
   "description": "Node.js libgit2 asynchronous native bindings",
-  "version": "0.11.4",
+  "version": "0.11.5",
   "homepage": "http://nodegit.org",
   "keywords": [
     "libgit2",
diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp
index bc8267513..8880a2438 100644
--- a/vendor/libgit2.gyp
+++ b/vendor/libgit2.gyp
@@ -333,6 +333,9 @@
             # 'InterlockedDecrement' undefined; assuming extern returning int.
             4013,
           ],
+          "include_dirs": [
+            "libgit2/deps/regex"
+          ],
           "sources": [
             "libgit2/src/win32/w32_buffer.c",
             "libgit2/src/win32/w32_buffer.h",
@@ -390,8 +393,7 @@
       ],
       "include_dirs": [
         "libgit2/include",
-        "libgit2/src",
-        "libgit2/deps/regex"
+        "libgit2/src"
       ],
       "direct_dependent_settings": {
         "include_dirs": [
@@ -427,9 +429,15 @@
         "STDC",
         "NO_GZIP",
       ],
+      "conditions": [
+        ["OS=='win'", {
+          "include_dirs": [
+            "libgit2/deps/regex"
+          ]
+        }]
+      ],
       "include_dirs": [
-        "libgit2/include",
-        "libgit2/deps/regex",
+        "libgit2/include"
       ],
       "direct_dependent_settings": {
         "include_dirs": [