diff --git a/CefSharp/CefSharp.h b/CefSharp/CefSharp.h
index 8e569471d8..dfad8060e5 100644
--- a/CefSharp/CefSharp.h
+++ b/CefSharp/CefSharp.h
@@ -49,7 +49,7 @@ namespace CefSharp
         {
             String^ get()
             {
-                return "trunk r286";
+                return "trunk r291";
             }
         }
 
diff --git a/include/cef.h b/include/cef.h
index 2ee17a8230..f07ba6d317 100644
--- a/include/cef.h
+++ b/include/cef.h
@@ -2249,7 +2249,8 @@ class CefV8Accessor : public virtual CefBase
   /*--cef()--*/
   virtual bool Get(const CefString& name,
                    const CefRefPtr<CefV8Value> object,
-                   CefRefPtr<CefV8Value>& retval) =0;
+                   CefRefPtr<CefV8Value>& retval,
+                   CefString& exception) =0;
 
   ///
   // Called to set an accessor value. |name| is the name of the property being
@@ -2260,7 +2261,8 @@ class CefV8Accessor : public virtual CefBase
   /*--cef()--*/
   virtual bool Set(const CefString& name,
                    const CefRefPtr<CefV8Value> object,
-                   const CefRefPtr<CefV8Value> value) =0;
+                   const CefRefPtr<CefV8Value> value,
+                   CefString& exception) =0;
 };
 
 
diff --git a/include/internal/cef_string.h b/include/internal/cef_string.h
index 192164915b..75db22b5e6 100644
--- a/include/internal/cef_string.h
+++ b/include/internal/cef_string.h
@@ -74,7 +74,7 @@ typedef cef_string_userfree_utf8_t cef_string_userfree_t;
 #define cef_string_to_wide cef_string_utf8_to_wide
 #define cef_string_from_wide cef_string_wide_to_utf8
 #elif defined(CEF_STRING_TYPE_UTF16)
-typedef char16_t cef_char_t;
+typedef char16 cef_char_t;
 typedef cef_string_userfree_utf16_t cef_string_userfree_t;
 typedef cef_string_utf16_t cef_string_t;
 #define cef_string_set cef_string_utf16_set
diff --git a/include/internal/cef_string_types.h b/include/internal/cef_string_types.h
index 28d182169c..f71ffed6c0 100644
--- a/include/internal/cef_string_types.h
+++ b/include/internal/cef_string_types.h
@@ -43,13 +43,13 @@ extern "C" {
 #include "cef_export.h"
 #include <stddef.h>
 
-// CEF character type definitions. wchat_t is 2 bytes on Windows and 4 bytes on
+// CEF character type definitions. wchar_t is 2 bytes on Windows and 4 bytes on
 // most other platforms.
 
 #if defined(OS_WIN)
-typedef wchar_t char16_t;
+typedef wchar_t char16;
 #else // !OS_WIN
-typedef unsigned short char16_t;
+typedef unsigned short char16;
 #ifndef WCHAR_T_IS_UTF32
 #define WCHAR_T_IS_UTF32
 #endif // WCHAR_T_IS_UTF32
@@ -76,9 +76,9 @@ typedef struct _cef_string_utf8_t {
 } cef_string_utf8_t;
 
 typedef struct _cef_string_utf16_t {
-  char16_t* str;
+  char16* str;
   size_t length;
-  void (*dtor)(char16_t* str);
+  void (*dtor)(char16* str);
 } cef_string_utf16_t;
 
 
@@ -92,7 +92,7 @@ CEF_EXPORT int cef_string_wide_set(const wchar_t* src, size_t src_len,
                                    cef_string_wide_t* output, int copy);
 CEF_EXPORT int cef_string_utf8_set(const char* src, size_t src_len,
                                    cef_string_utf8_t* output, int copy);
-CEF_EXPORT int cef_string_utf16_set(const char16_t* src, size_t src_len,
+CEF_EXPORT int cef_string_utf16_set(const char16* src, size_t src_len,
                                     cef_string_utf16_t* output, int copy);
 
 
@@ -143,12 +143,12 @@ CEF_EXPORT int cef_string_utf8_to_wide(const char* src, size_t src_len,
 
 CEF_EXPORT int cef_string_wide_to_utf16(const wchar_t* src, size_t src_len,
                                         cef_string_utf16_t* output);
-CEF_EXPORT int cef_string_utf16_to_wide(const char16_t* src, size_t src_len,
+CEF_EXPORT int cef_string_utf16_to_wide(const char16* src, size_t src_len,
                                         cef_string_wide_t* output);
 
 CEF_EXPORT int cef_string_utf8_to_utf16(const char* src, size_t src_len,
                                         cef_string_utf16_t* output);
-CEF_EXPORT int cef_string_utf16_to_utf8(const char16_t* src, size_t src_len,
+CEF_EXPORT int cef_string_utf16_to_utf8(const char16* src, size_t src_len,
                                         cef_string_utf8_t* output);
 
 
diff --git a/include/internal/cef_string_wrappers.h b/include/internal/cef_string_wrappers.h
index a5645d1f79..06fc426976 100644
--- a/include/internal/cef_string_wrappers.h
+++ b/include/internal/cef_string_wrappers.h
@@ -188,7 +188,7 @@ struct CefStringTraitsUTF8 {
 // Traits implementation for utf16 character strings.
 ///
 struct CefStringTraitsUTF16 {
-  typedef char16_t char_type;
+  typedef char16 char_type;
   typedef cef_string_utf16_t struct_type;
   typedef cef_string_userfree_utf16_t userfree_struct_type;
   
@@ -339,7 +339,7 @@ class CefStringBase {
   ///
   CefStringBase(const string16& src) : string_(NULL), owner_(false)
     { FromString16(src); }
-  CefStringBase(const char16_t* src) : string_(NULL), owner_(false)
+  CefStringBase(const char16* src) : string_(NULL), owner_(false)
     { FromString16(string16(src)); }
 #endif // BUILDING_CEF_SHARED && WCHAR_T_IS_UTF32
   
@@ -667,7 +667,7 @@ class CefStringBase {
   operator string16() const { return ToString16(); }
   CefStringBase& operator=(const string16& str)
     { FromString16(str); return *this; }
-  CefStringBase& operator=(const char16_t* str)
+  CefStringBase& operator=(const char16* str)
     { FromString16(string16(str)); return *this; }
 #endif // BUILDING_CEF_SHARED && WCHAR_T_IS_UTF32
 
diff --git a/libs/Debug/libcef.lib b/libs/Debug/libcef.lib
index 72c3cad67e..49a33de464 100644
Binary files a/libs/Debug/libcef.lib and b/libs/Debug/libcef.lib differ
diff --git a/libs/Debug/libcef_dll_wrapper.lib b/libs/Debug/libcef_dll_wrapper.lib
index 4abbd6bd3b..5636a612ee 100644
Binary files a/libs/Debug/libcef_dll_wrapper.lib and b/libs/Debug/libcef_dll_wrapper.lib differ
diff --git a/libs/Release/libcef.lib b/libs/Release/libcef.lib
index a4980c2f55..8ac29e9994 100644
Binary files a/libs/Release/libcef.lib and b/libs/Release/libcef.lib differ
diff --git a/libs/Release/libcef_dll_wrapper.lib b/libs/Release/libcef_dll_wrapper.lib
index fc568b67c7..4ed81e725a 100644
Binary files a/libs/Release/libcef_dll_wrapper.lib and b/libs/Release/libcef_dll_wrapper.lib differ