diff --git a/include/flatbuffers/code_generators.h b/include/flatbuffers/code_generators.h
index 6b27ea780..95fa0c1ac 100644
--- a/include/flatbuffers/code_generators.h
+++ b/include/flatbuffers/code_generators.h
@@ -21,17 +21,70 @@ namespace flatbuffers {
 
 class BaseGenerator {
  public:
-  BaseGenerator(const Parser &parser, const std::string &path,
-                const std::string &file_name)
-      : parser_(parser), path_(path), file_name_(file_name){};
   virtual bool generate() = 0;
 
+  static const std::string NamespaceDir(const Parser &parser,
+                                        const std::string &path) {
+    EnsureDirExists(path.c_str());
+    if (parser.opts.one_file) return path;
+    std::string namespace_dir = path;  // Either empty or ends in separator.
+    auto &namespaces = parser.namespaces_.back()->components;
+    for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
+      namespace_dir += *it + kPathSeparator;
+      EnsureDirExists(namespace_dir.c_str());
+    }
+    return namespace_dir;
+  }
+
  protected:
+  BaseGenerator(const Parser &parser, const std::string &path,
+                const std::string &file_name)
+      : parser_(parser),
+        path_(path),
+        file_name_(file_name),
+        namespace_dir_(BaseGenerator::NamespaceDir(parser, path)){};
   virtual ~BaseGenerator(){};
 
+  // No copy/assign.
+  BaseGenerator &operator=(const BaseGenerator &);
+  BaseGenerator(const BaseGenerator &);
+
+  const char *FlatBuffersGeneratedWarning() {
+    return "automatically generated by the FlatBuffers compiler,"
+           " do not modify\n\n";
+  }
+
+  bool IsEverythingGenerated() {
+    for (auto it = parser_.enums_.vec.begin(); it != parser_.enums_.vec.end();
+         ++it) {
+      if (!(*it)->generated) return false;
+    }
+    for (auto it = parser_.structs_.vec.begin();
+         it != parser_.structs_.vec.end(); ++it) {
+      if (!(*it)->generated) return false;
+    }
+    return true;
+  }
+
+  std::string FullNamespace(const char *separator) {
+    std::string namespace_name;
+    auto &namespaces = parser_.namespaces_.back()->components;
+    for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
+      if (namespace_name.length()) namespace_name += separator;
+      namespace_name += *it;
+    }
+    return namespace_name;
+  }
+
+  const std::string LastNamespacePart() {
+    auto &namespaces = parser_.namespaces_.back()->components;
+    if (namespaces.size()) return *(namespaces.end() - 1); else return std::string("");
+  }
+
   const Parser &parser_;
   const std::string &path_;
   const std::string &file_name_;
+  const std::string namespace_dir_;
 };
 
 }  // namespace flatbuffers
diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index b22aaaa6a..ff83da6d2 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -337,7 +337,7 @@ public:
 
   // Change elements if you have a non-const pointer to this object.
   // Scalars only. See reflection.h, and the documentation.
-  void Mutate(uoffset_t i, T val) {
+  void Mutate(uoffset_t i, const T& val) {
     assert(i < size());
     WriteScalar(data() + i, val);
   }
@@ -1161,6 +1161,17 @@ template<typename T> const T *GetRoot(const void *buf) {
   return GetMutableRoot<T>(const_cast<void *>(buf));
 }
 
+/// Helpers to get a typed pointer to objects that are currently beeing built.
+/// @warning Creating new objects will lead to reallocations and invalidates the pointer!
+template<typename T> T *GetMutableTemporaryPointer(FlatBufferBuilder &fbb, Offset<T> offset) {
+  return reinterpret_cast<T *>(fbb.GetCurrentBufferPointer() +
+    fbb.GetSize() - offset.o);
+}
+
+template<typename T> const T *GetTemporaryPointer(FlatBufferBuilder &fbb, Offset<T> offset) {
+  return GetMutableTemporaryPointer<T>(fbb, offset);
+}
+
 // Helper to see if the identifier in a buffer has the expected value.
 inline bool BufferHasIdentifier(const void *buf, const char *identifier) {
   return strncmp(reinterpret_cast<const char *>(buf) + sizeof(uoffset_t),
@@ -1495,6 +1506,35 @@ volatile __attribute__((weak)) const char *flatbuffer_version_string =
 
 #endif  // !defined(_WIN32) && !defined(__CYGWIN__)
 
+#define DEFINE_BITMASK_OPERATORS(E, T)\
+    inline E operator | (E lhs, E rhs){\
+        return E(T(lhs) | T(rhs));\
+    }\
+    inline E operator & (E lhs, E rhs){\
+        return E(T(lhs) & T(rhs));\
+    }\
+    inline E operator ^ (E lhs, E rhs){\
+        return E(T(lhs) ^ T(rhs));\
+    }\
+    inline E operator ~ (E lhs){\
+        return E(~T(lhs));\
+    }\
+    inline E operator |= (E &lhs, E rhs){\
+        lhs = lhs | rhs;\
+        return lhs;\
+    }\
+    inline E operator &= (E &lhs, E rhs){\
+        lhs = lhs & rhs;\
+        return lhs;\
+    }\
+    inline E operator ^= (E &lhs, E rhs){\
+        lhs = lhs ^ rhs;\
+        return lhs;\
+    }\
+    inline bool operator !(E rhs) \
+    {\
+        return !bool(T(rhs)); \
+    }
 /// @endcond
 }  // namespace flatbuffers
 
diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index 794ce65f0..7efa1334e 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -166,6 +166,7 @@ static void GenEnum(const Parser &parser, EnumDef &enum_def,
   if (parser.opts.scoped_enums)
     code += " : " + GenTypeBasic(enum_def.underlying_type, false);
   code += " {\n";
+  int64_t anyv = 0;
   EnumVal *minv = nullptr, *maxv = nullptr;
   for (auto it = enum_def.vals.vec.begin();
        it != enum_def.vals.vec.end();
@@ -176,13 +177,26 @@ static void GenEnum(const Parser &parser, EnumDef &enum_def,
     code += NumToString(ev.value) + ",\n";
     minv = !minv || minv->value > ev.value ? &ev : minv;
     maxv = !maxv || maxv->value < ev.value ? &ev : maxv;
+    anyv |= ev.value;
   }
-  assert(minv && maxv);
-  code += "  " + GenEnumVal(enum_def, "MIN", parser.opts) + " = ";
-  code += GenEnumVal(enum_def, minv->name, parser.opts) + ",\n";
-  code += "  " + GenEnumVal(enum_def, "MAX", parser.opts) + " = ";
-  code += GenEnumVal(enum_def, maxv->name, parser.opts) + "\n";
-  code += "};\n\n";
+  if (parser.opts.scoped_enums || parser.opts.prefixed_enums) {
+    assert(minv && maxv);
+    if (enum_def.attributes.Lookup("bit_flags")) {
+      if (minv->value != 0) // If the user didn't defined NONE value
+        code += "  " + GenEnumVal(enum_def, "NONE", parser.opts) + " = 0,\n";
+      if (maxv->value != anyv) // If the user didn't defined ANY value
+        code += "  " + GenEnumVal(enum_def, "ANY", parser.opts) + " = " + NumToString(anyv) + "\n";
+    } else { // MIN & MAX are useless for bit_flags
+      code += "  " + GenEnumVal(enum_def, "MIN", parser.opts) + " = ";
+      code += GenEnumVal(enum_def, minv->name, parser.opts) + ",\n";
+      code += "  " + GenEnumVal(enum_def, "MAX", parser.opts) + " = ";
+      code += GenEnumVal(enum_def, maxv->name, parser.opts) + "\n";
+    }
+  }
+  code += "};\n";
+  if (parser.opts.scoped_enums && enum_def.attributes.Lookup("bit_flags"))
+    code += "DEFINE_BITMASK_OPERATORS(" + enum_def.name + ", " +  GenTypeBasic(enum_def.underlying_type, false) + ")\n";
+  code += "\n";
 
   // Generate a generate string table for enum values.
   // Problem is, if values are very sparse that could generate really big
@@ -730,26 +744,10 @@ class CppGenerator : public BaseGenerator {
   // structs,
   // and tables) and output them to a single file.
   bool generate() {
-    // Check if we have any code to generate at all, to avoid an empty header.
-    for (auto it = parser_.enums_.vec.begin(); it != parser_.enums_.vec.end();
-         ++it) {
-      if (!(*it)->generated) goto generate_code;
-    }
-    for (auto it = parser_.structs_.vec.begin(); it != parser_.structs_.vec.end();
-         ++it) {
-      if (!(*it)->generated) goto generate_code;
-    }
-    // No code to generate, exit:
-    return true;
-
-  generate_code:
-
-    using namespace cpp;
+    if (IsEverythingGenerated()) return true;
 
     std::string code;
-    code =
-        "// automatically generated by the FlatBuffers compiler,"
-        " do not modify\n\n";
+    code = code + "// " + FlatBuffersGeneratedWarning();
 
     // Generate include guard.
     std::string include_guard_ident = file_name_;
diff --git a/src/idl_gen_general.cpp b/src/idl_gen_general.cpp
index 4a4e54dc4..a0b837a20 100644
--- a/src/idl_gen_general.cpp
+++ b/src/idl_gen_general.cpp
@@ -1115,40 +1115,6 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
   code += "};\n\n";
 }
 
-// Save out the generated code for a single class while adding
-// declaration boilerplate.
-static bool SaveClass(const LanguageParameters &lang, const Parser &parser,
-                      const std::string &defname, const std::string &classcode,
-                      const std::string &path, bool needs_includes, bool onefile) {
-  if (!classcode.length()) return true;
-
-  std::string namespace_general;
-  std::string namespace_dir = path;  // Either empty or ends in separator.
-  auto &namespaces = parser.namespaces_.back()->components;
-  for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
-    if (namespace_general.length()) {
-      namespace_general += ".";
-    }
-    namespace_general += *it;
-    if (!onefile) {
-      namespace_dir += *it + kPathSeparator;
-    }
-
-  }
-  EnsureDirExists(namespace_dir);
-
-  std::string code = "// automatically generated, do not modify\n\n";
-  if (!namespace_general.empty()) {
-    code += lang.namespace_ident + namespace_general + lang.namespace_begin;
-    code += "\n\n";
-  }
-  if (needs_includes) code += lang.includes;
-  code += classcode;
-  if (!namespace_general.empty()) code += lang.namespace_end;
-  auto filename = namespace_dir + defname + lang.file_extension;
-  return SaveFile(filename.c_str(), code, false);
-}
-
 namespace general {
 class GeneralGenerator : public BaseGenerator {
  public:
@@ -1167,9 +1133,7 @@ class GeneralGenerator : public BaseGenerator {
       if (parser_.opts.one_file) {
         one_file_code += enumcode;
       } else {
-        if (!SaveClass(lang, parser_, (**it).name, enumcode, path_, false,
-                       false))
-          return false;
+        if (!SaveType(lang, (**it).name, enumcode, false)) return false;
       }
     }
 
@@ -1180,18 +1144,35 @@ class GeneralGenerator : public BaseGenerator {
       if (parser_.opts.one_file) {
         one_file_code += declcode;
       } else {
-        if (!SaveClass(lang, parser_, (**it).name, declcode, path_, true,
-                       false))
-          return false;
+        if (!SaveType(lang, (**it).name, declcode, true)) return false;
       }
     }
 
     if (parser_.opts.one_file) {
-      return SaveClass(lang, parser_, file_name_, one_file_code, path_, true,
-                       true);
+      return SaveType(lang, file_name_, one_file_code, true);
     }
     return true;
   }
+
+  // Save out the generated code for a single class while adding
+  // declaration boilerplate.
+  bool SaveType(const LanguageParameters &lang, const std::string &defname,
+                const std::string &classcode, bool needs_includes) {
+    if (!classcode.length()) return true;
+
+    std::string code;
+    code = code + "// " + FlatBuffersGeneratedWarning();
+    std::string namespace_name = FullNamespace(".");
+    if (!namespace_name.empty()) {
+      code += lang.namespace_ident + namespace_name + lang.namespace_begin;
+      code += "\n\n";
+    }
+    if (needs_includes) code += lang.includes;
+    code += classcode;
+    if (!namespace_name.empty()) code += lang.namespace_end;
+    auto filename = namespace_dir_ + defname + lang.file_extension;
+    return SaveFile(filename.c_str(), code, false);
+  }
 };
 }  // namespace general
 
@@ -1201,50 +1182,30 @@ bool GenerateGeneral(const Parser &parser, const std::string &path,
   return generator.generate();
 }
 
-static std::string ClassFileName(const LanguageParameters &lang,
-                                 const Parser &parser, const Definition &def,
-                                 const std::string &path) {
-  std::string namespace_general;
-  std::string namespace_dir = path;
-  auto &namespaces = parser.namespaces_.back()->components;
-  for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
-    if (namespace_general.length()) {
-      namespace_general += ".";
-      namespace_dir += kPathSeparator;
-    }
-    namespace_general += *it;
-    namespace_dir += *it;
-  }
-
-  return namespace_dir + kPathSeparator + def.name + lang.file_extension;
-}
-
-std::string GeneralMakeRule(const Parser &parser,
-                            const std::string &path,
+std::string GeneralMakeRule(const Parser &parser, const std::string &path,
                             const std::string &file_name) {
   assert(parser.opts.lang <= IDLOptions::kMAX);
   auto lang = language_parameters[parser.opts.lang];
 
   std::string make_rule;
+  std::string directory =
+      BaseGenerator::NamespaceDir(parser, path) + kPathSeparator;
 
-  for (auto it = parser.enums_.vec.begin();
-       it != parser.enums_.vec.end(); ++it) {
-    if (make_rule != "")
-      make_rule += " ";
-    make_rule += ClassFileName(lang, parser, **it, path);
+  for (auto it = parser.enums_.vec.begin(); it != parser.enums_.vec.end();
+       ++it) {
+    if (make_rule != "") make_rule += " ";
+    make_rule += directory + (**it).name + lang.file_extension;
   }
 
-  for (auto it = parser.structs_.vec.begin();
-       it != parser.structs_.vec.end(); ++it) {
-    if (make_rule != "")
-      make_rule += " ";
-    make_rule += ClassFileName(lang, parser, **it, path);
+  for (auto it = parser.structs_.vec.begin(); it != parser.structs_.vec.end();
+       ++it) {
+    if (make_rule != "") make_rule += " ";
+    make_rule += directory + (**it).name + lang.file_extension;
   }
 
   make_rule += ": ";
   auto included_files = parser.GetIncludedFilesRecursive(file_name);
-  for (auto it = included_files.begin();
-       it != included_files.end(); ++it) {
+  for (auto it = included_files.begin(); it != included_files.end(); ++it) {
     make_rule += " " + *it;
   }
   return make_rule;
diff --git a/src/idl_gen_go.cpp b/src/idl_gen_go.cpp
index bce8f95bc..5841e121c 100644
--- a/src/idl_gen_go.cpp
+++ b/src/idl_gen_go.cpp
@@ -53,20 +53,6 @@ std::string OffsetPrefix(const FieldDef &field) {
          "))\n\tif o != 0 {\n";
 }
 
-// Begin by declaring namespace and imports.
-static void BeginFile(const std::string name_space_name,
-                      const bool needs_imports,
-                      std::string *code_ptr) {
-  std::string &code = *code_ptr;
-  code += "// automatically generated, do not modify\n\n";
-  code += "package " + name_space_name + "\n\n";
-  if (needs_imports) {
-    code += "import (\n";
-    code += "\tflatbuffers \"github.com/google/flatbuffers/go\"\n";
-    code += ")\n";
-  }
-}
-
 // Begin a class declaration.
 static void BeginClass(const StructDef &struct_def, std::string *code_ptr) {
   std::string &code = *code_ptr;
@@ -589,32 +575,6 @@ static std::string GenMethod(const FieldDef &field) {
     : (IsStruct(field.value.type) ? "Struct" : "UOffsetT");
 }
 
-
-// Save out the generated code for a Go Table type.
-static bool SaveType(const Parser &parser, const Definition &def,
-                     const std::string &classcode, const std::string &path,
-                     bool needs_imports) {
-  if (!classcode.length()) return true;
-
-  std::string namespace_name;
-  std::string namespace_dir = path;  // Either empty or ends in separator.
-  auto &namespaces = parser.namespaces_.back()->components;
-  for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
-    if (namespace_name.length()) {
-      namespace_name += ".";
-    }
-    namespace_name = *it;
-    namespace_dir += *it + kPathSeparator;
-  }
-  EnsureDirExists(namespace_dir);
-
-  std::string code = "";
-  BeginFile(namespace_name, needs_imports, &code);
-  code += classcode;
-  std::string filename = namespace_dir + def.name + ".go";
-  return SaveFile(filename.c_str(), code, false);
-}
-
 static std::string GenTypeBasic(const Type &type) {
   static const char *ctypename[] = {
     #define FLATBUFFERS_TD(ENUM, IDLTYPE, CTYPE, JTYPE, GTYPE, NTYPE, PTYPE) \
@@ -671,18 +631,44 @@ class GoGenerator : public BaseGenerator {
          ++it) {
       std::string enumcode;
       go::GenEnum(**it, &enumcode);
-      if (!go::SaveType(parser_, **it, enumcode, path_, false)) return false;
+      if (!SaveType(**it, enumcode, false)) return false;
     }
 
     for (auto it = parser_.structs_.vec.begin();
          it != parser_.structs_.vec.end(); ++it) {
       std::string declcode;
       go::GenStruct(**it, &declcode, parser_.root_struct_def_);
-      if (!go::SaveType(parser_, **it, declcode, path_, true)) return false;
+      if (!SaveType(**it, declcode, true)) return false;
     }
 
     return true;
   }
+
+ private:
+  // Begin by declaring namespace and imports.
+  void BeginFile(const std::string name_space_name, const bool needs_imports,
+                 std::string *code_ptr) {
+    std::string &code = *code_ptr;
+    code = code + "// " + FlatBuffersGeneratedWarning();
+    code += "package " + name_space_name + "\n\n";
+    if (needs_imports) {
+      code += "import (\n";
+      code += "\tflatbuffers \"github.com/google/flatbuffers/go\"\n";
+      code += ")\n";
+    }
+  }
+
+  // Save out the generated code for a Go Table type.
+  bool SaveType(const Definition &def, const std::string &classcode,
+                bool needs_imports) {
+    if (!classcode.length()) return true;
+
+    std::string code = "";
+    BeginFile(LastNamespacePart(), needs_imports, &code);
+    code += classcode;
+    std::string filename = namespace_dir_ + def.name + ".go";
+    return SaveFile(filename.c_str(), code, false);
+  }
 };
 }  // namespace go
 
diff --git a/src/idl_gen_js.cpp b/src/idl_gen_js.cpp
index de81f2764..d724b80f4 100644
--- a/src/idl_gen_js.cpp
+++ b/src/idl_gen_js.cpp
@@ -678,31 +678,27 @@ class JsGenerator : public BaseGenerator {
   // Iterate through all definitions we haven't generate code for (enums,
   // structs, and tables) and output them to a single file.
   bool generate() {
+    if (IsEverythingGenerated()) return true;
+
     std::string enum_code, struct_code, exports_code, code;
     generateEnums(&enum_code, &exports_code);
     generateStructs(&struct_code, &exports_code);
 
-    // Only output file-level code if there were any declarations.
-    if (enum_code.length() || struct_code.length()) {
-      code +=
-          "// automatically generated by the FlatBuffers compiler, do not "
-          "modify\n\n";
+    code = code + "// " + FlatBuffersGeneratedWarning();
 
-      // Generate code for all the namespace declarations.
-      GenNamespaces(parser_, &code, &exports_code);
+    // Generate code for all the namespace declarations.
+    GenNamespaces(parser_, &code, &exports_code);
 
-      // Output the main declaration code from above.
-      code += enum_code;
-      code += struct_code;
+    // Output the main declaration code from above.
+    code += enum_code;
+    code += struct_code;
 
-      if (!exports_code.empty() && !parser_.opts.skip_js_exports) {
-        code += "// Exports for Node.js and RequireJS\n";
-        code += exports_code;
-      }
+    if (!exports_code.empty() && !parser_.opts.skip_js_exports) {
+      code += "// Exports for Node.js and RequireJS\n";
+      code += exports_code;
     }
 
-    return !code.length() ||
-           SaveFile(GeneratedFileName(path_, file_name_).c_str(), code, false);
+    return SaveFile(GeneratedFileName(path_, file_name_).c_str(), code, false);
   }
 
  private:
diff --git a/src/idl_gen_php.cpp b/src/idl_gen_php.cpp
index b43ea6702..599d5571d 100644
--- a/src/idl_gen_php.cpp
+++ b/src/idl_gen_php.cpp
@@ -54,24 +54,6 @@ namespace php {
     // Hardcode spaces per indentation.
     const std::string Indent = "    ";
 
-    // Begin by declaring namespace and imports.
-    static void BeginFile(const std::string name_space_name,
-      const bool needs_imports,
-      std::string *code_ptr) {
-      std::string &code = *code_ptr;
-      code += "<?php\n";
-      code += "// automatically generated, do not modify\n\n";
-      code += "namespace " + name_space_name + ";\n\n";
-
-      if (needs_imports) {
-        code += "use \\Google\\FlatBuffers\\Struct;\n";
-        code += "use \\Google\\FlatBuffers\\Table;\n";
-        code += "use \\Google\\FlatBuffers\\ByteBuffer;\n";
-        code += "use \\Google\\FlatBuffers\\FlatBufferBuilder;\n";
-        code += "\n";
-      }
-    }
-
     // Begin a class declaration.
     static void BeginClass(const StructDef &struct_def, std::string *code_ptr) {
       std::string &code = *code_ptr;
@@ -867,35 +849,6 @@ namespace php {
         : (IsStruct(field.value.type) ? "Struct" : "Offset");
     }
 
-
-    // Save out the generated code for a Php Table type.
-    static bool SaveType(const Parser &parser, const Definition &def,
-      const std::string &classcode, const std::string &path,
-      bool needs_imports) {
-      if (!classcode.length()) return true;
-
-      std::string namespace_name;
-      std::string namespace_dir = path;
-
-      auto &namespaces = parser.namespaces_.back()->components;
-      for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
-        if (namespace_name.length()) {
-          namespace_name += "\\";
-          namespace_dir += kPathSeparator;
-        }
-        namespace_name += *it;
-        namespace_dir += *it;
-        EnsureDirExists(namespace_dir.c_str());
-      }
-
-      std::string code = "";
-      BeginFile(namespace_name, needs_imports, &code);
-      code += classcode;
-
-      std::string filename = namespace_dir + kPathSeparator + def.name + ".php";
-      return SaveFile(filename.c_str(), code, false);
-    }
-
     static std::string GenTypeBasic(const Type &type) {
       static const char *ctypename[] = {
 #define FLATBUFFERS_TD(ENUM, IDLTYPE, CTYPE, JTYPE, GTYPE, NTYPE, PTYPE) \
@@ -993,8 +946,7 @@ namespace php {
           auto &enum_def = **it;
           std::string enumcode;
           GenEnum(enum_def, &enumcode);
-          if (!SaveType(parser_, enum_def, enumcode, path_, false))
-            return false;
+          if (!SaveType(enum_def, enumcode, false)) return false;
         }
         return true;
       }
@@ -1005,11 +957,41 @@ namespace php {
           auto &struct_def = **it;
           std::string declcode;
           GenStruct(parser_, struct_def, &declcode);
-          if (!SaveType(parser_, struct_def, declcode, path_, true))
-            return false;
+          if (!SaveType(struct_def, declcode, true)) return false;
         }
         return true;
       }
+
+      // Begin by declaring namespace and imports.
+      void BeginFile(const std::string name_space_name,
+                     const bool needs_imports, std::string *code_ptr) {
+        std::string &code = *code_ptr;
+        code += "<?php\n";
+        code = code + "// " + FlatBuffersGeneratedWarning();
+        code += "namespace " + name_space_name + ";\n\n";
+
+        if (needs_imports) {
+          code += "use \\Google\\FlatBuffers\\Struct;\n";
+          code += "use \\Google\\FlatBuffers\\Table;\n";
+          code += "use \\Google\\FlatBuffers\\ByteBuffer;\n";
+          code += "use \\Google\\FlatBuffers\\FlatBufferBuilder;\n";
+          code += "\n";
+        }
+      }
+
+      // Save out the generated code for a Php Table type.
+      bool SaveType(const Definition &def, const std::string &classcode,
+                    bool needs_imports) {
+        if (!classcode.length()) return true;
+
+        std::string code = "";
+        BeginFile(FullNamespace("\\"), needs_imports, &code);
+        code += classcode;
+
+        std::string filename =
+            namespace_dir_ + kPathSeparator + def.name + ".php";
+        return SaveFile(filename.c_str(), code, false);
+      }
     };
     }  // namespace php
 
diff --git a/src/idl_gen_python.cpp b/src/idl_gen_python.cpp
index ee6d16874..7b8d168c1 100644
--- a/src/idl_gen_python.cpp
+++ b/src/idl_gen_python.cpp
@@ -49,18 +49,6 @@ std::string OffsetPrefix(const FieldDef &field) {
          "))\n" + Indent + Indent + "if o != 0:\n";
 }
 
-// Begin by declaring namespace and imports.
-static void BeginFile(const std::string name_space_name,
-                      const bool needs_imports,
-                      std::string *code_ptr) {
-  std::string &code = *code_ptr;
-  code += "# automatically generated, do not modify\n\n";
-  code += "# namespace: " + name_space_name + "\n\n";
-  if (needs_imports) {
-    code += "import flatbuffers\n\n";
-  }
-}
-
 // Begin a class declaration.
 static void BeginClass(const StructDef &struct_def, std::string *code_ptr) {
   std::string &code = *code_ptr;
@@ -558,37 +546,6 @@ static std::string GenMethod(const FieldDef &field) {
     : (IsStruct(field.value.type) ? "Struct" : "UOffsetTRelative");
 }
 
-
-// Save out the generated code for a Python Table type.
-static bool SaveType(const Parser &parser, const Definition &def,
-                     const std::string &classcode, const std::string &path,
-                     bool needs_imports) {
-  if (!classcode.length()) return true;
-
-  std::string namespace_name;
-  std::string namespace_dir = path;
-  auto &namespaces = parser.namespaces_.back()->components;
-  for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
-    if (namespace_name.length()) {
-      namespace_name += ".";
-      namespace_dir += kPathSeparator;
-    }
-    namespace_name = *it;
-    namespace_dir += *it;
-    EnsureDirExists(namespace_dir.c_str());
-
-    std::string init_py_filename = namespace_dir + "/__init__.py";
-    SaveFile(init_py_filename.c_str(), "", false);
-  }
-
-
-  std::string code = "";
-  BeginFile(namespace_name, needs_imports, &code);
-  code += classcode;
-  std::string filename = namespace_dir + kPathSeparator + def.name + ".py";
-  return SaveFile(filename.c_str(), code, false);
-}
-
 static std::string GenTypeBasic(const Type &type) {
   static const char *ctypename[] = {
     #define FLATBUFFERS_TD(ENUM, IDLTYPE, CTYPE, JTYPE, GTYPE, NTYPE, PTYPE) \
@@ -653,7 +610,7 @@ class PythonGenerator : public BaseGenerator {
       auto &enum_def = **it;
       std::string enumcode;
       GenEnum(enum_def, &enumcode);
-      if (!SaveType(parser_, enum_def, enumcode, path_, false)) return false;
+      if (!SaveType(enum_def, enumcode, false)) return false;
     }
     return true;
   }
@@ -664,10 +621,42 @@ class PythonGenerator : public BaseGenerator {
       auto &struct_def = **it;
       std::string declcode;
       GenStruct(struct_def, &declcode, parser_.root_struct_def_);
-      if (!SaveType(parser_, struct_def, declcode, path_, true)) return false;
+      if (!SaveType(struct_def, declcode, true)) return false;
     }
     return true;
   }
+
+  // Begin by declaring namespace and imports.
+  void BeginFile(const std::string name_space_name, const bool needs_imports,
+                 std::string *code_ptr) {
+    std::string &code = *code_ptr;
+    code = code + "# " + FlatBuffersGeneratedWarning();
+    code += "# namespace: " + name_space_name + "\n\n";
+    if (needs_imports) {
+      code += "import flatbuffers\n\n";
+    }
+  }
+
+  // Save out the generated code for a Python Table type.
+  bool SaveType(const Definition &def, const std::string &classcode,
+                bool needs_imports) {
+    if (!classcode.length()) return true;
+
+    std::string namespace_dir = path_;
+    auto &namespaces = parser_.namespaces_.back()->components;
+    for (auto it = namespaces.begin(); it != namespaces.end(); ++it) {
+      if (it != namespaces.begin()) namespace_dir += kPathSeparator;
+      namespace_dir += *it;
+      std::string init_py_filename = namespace_dir + "/__init__.py";
+      SaveFile(init_py_filename.c_str(), "", false);
+    }
+
+    std::string code = "";
+    BeginFile(LastNamespacePart(), needs_imports, &code);
+    code += classcode;
+    std::string filename = namespace_dir_ + kPathSeparator + def.name + ".py";
+    return SaveFile(filename.c_str(), code, false);
+  }
 };
 
 }  // namespace python
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index a606781b5..f5badab16 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -236,12 +236,19 @@ CheckedError Parser::Next() {
         if(!isdigit(static_cast<const unsigned char>(*cursor_))) return NoError();
         return Error("floating point constant can\'t start with \".\"");
       case '\"':
-      case '\'':
+      case '\'': {
+        int unicode_high_surrogate = -1;
+
         while (*cursor_ != c) {
           if (*cursor_ < ' ' && *cursor_ >= 0)
             return Error("illegal character in string constant");
           if (*cursor_ == '\\') {
             cursor_++;
+            if (unicode_high_surrogate != -1 &&
+                *cursor_ != 'u') {
+              return Error(
+                "illegal Unicode sequence (unpaired high surrogate)");
+            }
             switch (*cursor_) {
               case 'n':  attribute_ += '\n'; cursor_++; break;
               case 't':  attribute_ += '\t'; cursor_++; break;
@@ -263,18 +270,51 @@ CheckedError Parser::Next() {
                 cursor_++;
                 int64_t val;
                 ECHECK(ParseHexNum(4, &val));
-                ToUTF8(static_cast<int>(val), &attribute_);
+                if (val >= 0xD800 && val <= 0xDBFF) {
+                  if (unicode_high_surrogate != -1) {
+                    return Error(
+                      "illegal Unicode sequence (multiple high surrogates)");
+                  } else {
+                    unicode_high_surrogate = static_cast<int>(val);
+                  }
+                } else if (val >= 0xDC00 && val <= 0xDFFF) {
+                  if (unicode_high_surrogate == -1) {
+                    return Error(
+                      "illegal Unicode sequence (unpaired low surrogate)");
+                  } else {
+                    int code_point = 0x10000 +
+                      ((unicode_high_surrogate & 0x03FF) << 10) +
+                      (val & 0x03FF);
+                    ToUTF8(code_point, &attribute_);
+                    unicode_high_surrogate = -1;
+                  }
+                } else {
+                  if (unicode_high_surrogate != -1) {
+                    return Error(
+                      "illegal Unicode sequence (unpaired high surrogate)");
+                  }
+                  ToUTF8(static_cast<int>(val), &attribute_);
+                }
                 break;
               }
               default: return Error("unknown escape code in string constant");
             }
           } else { // printable chars + UTF-8 bytes
+            if (unicode_high_surrogate != -1) {
+              return Error(
+                "illegal Unicode sequence (unpaired high surrogate)");
+            }
             attribute_ += *cursor_++;
           }
         }
+        if (unicode_high_surrogate != -1) {
+          return Error(
+            "illegal Unicode sequence (unpaired high surrogate)");
+        }
         cursor_++;
         token_ = kTokenStringConstant;
         return NoError();
+      }
       case '/':
         if (*cursor_ == '/') {
           const char *start = ++cursor_;
@@ -1961,14 +2001,14 @@ flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<
     Definition::SerializeAttributes(FlatBufferBuilder *builder,
                                     const Parser &parser) const {
   std::vector<flatbuffers::Offset<reflection::KeyValue>> attrs;
-  for (auto kv : attributes.dict) {
-    auto it = parser.known_attributes_.find(kv.first);
+  for (auto kv = attributes.dict.begin(); kv != attributes.dict.end(); ++kv) {
+    auto it = parser.known_attributes_.find(kv->first);
     assert(it != parser.known_attributes_.end());
     if (!it->second) {  // Custom attribute.
       attrs.push_back(
-          reflection::CreateKeyValue(*builder, builder->CreateString(kv.first),
+          reflection::CreateKeyValue(*builder, builder->CreateString(kv->first),
                                      builder->CreateString(
-                                         kv.second->constant)));
+                                         kv->second->constant)));
     }
   }
   if (attrs.size()) {
diff --git a/tests/MyGame/Example/Any.cs b/tests/MyGame/Example/Any.cs
index a05a91851..1f018ad89 100644
--- a/tests/MyGame/Example/Any.cs
+++ b/tests/MyGame/Example/Any.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame.Example
 {
diff --git a/tests/MyGame/Example/Any.go b/tests/MyGame/Example/Any.go
index a23de4cbc..0322364c6 100644
--- a/tests/MyGame/Example/Any.go
+++ b/tests/MyGame/Example/Any.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package Example
 
diff --git a/tests/MyGame/Example/Any.java b/tests/MyGame/Example/Any.java
index cdc3ec567..27dc1bcb9 100644
--- a/tests/MyGame/Example/Any.java
+++ b/tests/MyGame/Example/Any.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package MyGame.Example;
 
diff --git a/tests/MyGame/Example/Any.php b/tests/MyGame/Example/Any.php
index d35bfd639..f04f4ad3f 100644
--- a/tests/MyGame/Example/Any.php
+++ b/tests/MyGame/Example/Any.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame\Example;
 
diff --git a/tests/MyGame/Example/Any.py b/tests/MyGame/Example/Any.py
index a247b528c..b642ede01 100644
--- a/tests/MyGame/Example/Any.py
+++ b/tests/MyGame/Example/Any.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: Example
 
diff --git a/tests/MyGame/Example/Color.cs b/tests/MyGame/Example/Color.cs
index 7843733e3..625d040a9 100644
--- a/tests/MyGame/Example/Color.cs
+++ b/tests/MyGame/Example/Color.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame.Example
 {
diff --git a/tests/MyGame/Example/Color.go b/tests/MyGame/Example/Color.go
index 289a7b063..09f6d5805 100644
--- a/tests/MyGame/Example/Color.go
+++ b/tests/MyGame/Example/Color.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package Example
 
diff --git a/tests/MyGame/Example/Color.java b/tests/MyGame/Example/Color.java
index 822d2bbfe..502ec9fbf 100644
--- a/tests/MyGame/Example/Color.java
+++ b/tests/MyGame/Example/Color.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package MyGame.Example;
 
diff --git a/tests/MyGame/Example/Color.php b/tests/MyGame/Example/Color.php
index 9de0e68f9..70c7bfd94 100644
--- a/tests/MyGame/Example/Color.php
+++ b/tests/MyGame/Example/Color.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame\Example;
 
diff --git a/tests/MyGame/Example/Color.py b/tests/MyGame/Example/Color.py
index 18b147dce..36e80a367 100644
--- a/tests/MyGame/Example/Color.py
+++ b/tests/MyGame/Example/Color.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: Example
 
diff --git a/tests/MyGame/Example/Monster.cs b/tests/MyGame/Example/Monster.cs
index abe95ec84..6101f464c 100644
--- a/tests/MyGame/Example/Monster.cs
+++ b/tests/MyGame/Example/Monster.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame.Example
 {
diff --git a/tests/MyGame/Example/Monster.go b/tests/MyGame/Example/Monster.go
index 5aa4a73e9..fbd849e81 100644
--- a/tests/MyGame/Example/Monster.go
+++ b/tests/MyGame/Example/Monster.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package Example
 
diff --git a/tests/MyGame/Example/Monster.java b/tests/MyGame/Example/Monster.java
index 69c975436..d85e4baac 100644
--- a/tests/MyGame/Example/Monster.java
+++ b/tests/MyGame/Example/Monster.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package MyGame.Example;
 
diff --git a/tests/MyGame/Example/Monster.php b/tests/MyGame/Example/Monster.php
index 879b76247..9f82d5a9c 100644
--- a/tests/MyGame/Example/Monster.php
+++ b/tests/MyGame/Example/Monster.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame\Example;
 
diff --git a/tests/MyGame/Example/Monster.py b/tests/MyGame/Example/Monster.py
index 42b79939b..4f1ca2dfa 100644
--- a/tests/MyGame/Example/Monster.py
+++ b/tests/MyGame/Example/Monster.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: Example
 
diff --git a/tests/MyGame/Example/Stat.cs b/tests/MyGame/Example/Stat.cs
index 2b3f5375f..30eaee5ea 100644
--- a/tests/MyGame/Example/Stat.cs
+++ b/tests/MyGame/Example/Stat.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame.Example
 {
diff --git a/tests/MyGame/Example/Stat.go b/tests/MyGame/Example/Stat.go
index 936d5ec9c..7c33716b4 100644
--- a/tests/MyGame/Example/Stat.go
+++ b/tests/MyGame/Example/Stat.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package Example
 
diff --git a/tests/MyGame/Example/Stat.java b/tests/MyGame/Example/Stat.java
index dd3716330..3cac509b7 100644
--- a/tests/MyGame/Example/Stat.java
+++ b/tests/MyGame/Example/Stat.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package MyGame.Example;
 
diff --git a/tests/MyGame/Example/Stat.php b/tests/MyGame/Example/Stat.php
index c959ac7bb..6ef70348d 100644
--- a/tests/MyGame/Example/Stat.php
+++ b/tests/MyGame/Example/Stat.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame\Example;
 
diff --git a/tests/MyGame/Example/Stat.py b/tests/MyGame/Example/Stat.py
index 23bef0db6..71577e868 100644
--- a/tests/MyGame/Example/Stat.py
+++ b/tests/MyGame/Example/Stat.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: Example
 
diff --git a/tests/MyGame/Example/Test.cs b/tests/MyGame/Example/Test.cs
index 5bd2e58dd..bd82295fc 100644
--- a/tests/MyGame/Example/Test.cs
+++ b/tests/MyGame/Example/Test.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame.Example
 {
diff --git a/tests/MyGame/Example/Test.go b/tests/MyGame/Example/Test.go
index dc4de8eec..e849488d9 100644
--- a/tests/MyGame/Example/Test.go
+++ b/tests/MyGame/Example/Test.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package Example
 
diff --git a/tests/MyGame/Example/Test.java b/tests/MyGame/Example/Test.java
index ffd7394f6..52474152f 100644
--- a/tests/MyGame/Example/Test.java
+++ b/tests/MyGame/Example/Test.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package MyGame.Example;
 
diff --git a/tests/MyGame/Example/Test.php b/tests/MyGame/Example/Test.php
index acc838a33..13cced001 100644
--- a/tests/MyGame/Example/Test.php
+++ b/tests/MyGame/Example/Test.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame\Example;
 
diff --git a/tests/MyGame/Example/Test.py b/tests/MyGame/Example/Test.py
index 4c4912a61..3b2fd45f7 100644
--- a/tests/MyGame/Example/Test.py
+++ b/tests/MyGame/Example/Test.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: Example
 
diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.cs b/tests/MyGame/Example/TestSimpleTableWithEnum.cs
index c1bf571f8..63cb9e19a 100644
--- a/tests/MyGame/Example/TestSimpleTableWithEnum.cs
+++ b/tests/MyGame/Example/TestSimpleTableWithEnum.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame.Example
 {
diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.go b/tests/MyGame/Example/TestSimpleTableWithEnum.go
index a26a53e46..fe9cf2dbb 100644
--- a/tests/MyGame/Example/TestSimpleTableWithEnum.go
+++ b/tests/MyGame/Example/TestSimpleTableWithEnum.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package Example
 
diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.java b/tests/MyGame/Example/TestSimpleTableWithEnum.java
index 3000cab47..85e18c2b3 100644
--- a/tests/MyGame/Example/TestSimpleTableWithEnum.java
+++ b/tests/MyGame/Example/TestSimpleTableWithEnum.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package MyGame.Example;
 
diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.php b/tests/MyGame/Example/TestSimpleTableWithEnum.php
index 6181461e5..d37481fc3 100644
--- a/tests/MyGame/Example/TestSimpleTableWithEnum.php
+++ b/tests/MyGame/Example/TestSimpleTableWithEnum.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame\Example;
 
diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.py b/tests/MyGame/Example/TestSimpleTableWithEnum.py
index 7085995be..5b9509791 100644
--- a/tests/MyGame/Example/TestSimpleTableWithEnum.py
+++ b/tests/MyGame/Example/TestSimpleTableWithEnum.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: Example
 
diff --git a/tests/MyGame/Example/Vec3.cs b/tests/MyGame/Example/Vec3.cs
index e5fa2f674..a6d21face 100644
--- a/tests/MyGame/Example/Vec3.cs
+++ b/tests/MyGame/Example/Vec3.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame.Example
 {
diff --git a/tests/MyGame/Example/Vec3.go b/tests/MyGame/Example/Vec3.go
index def0b4d1b..082945ed3 100644
--- a/tests/MyGame/Example/Vec3.go
+++ b/tests/MyGame/Example/Vec3.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package Example
 
diff --git a/tests/MyGame/Example/Vec3.java b/tests/MyGame/Example/Vec3.java
index 86edb6dc5..7ae1ce209 100644
--- a/tests/MyGame/Example/Vec3.java
+++ b/tests/MyGame/Example/Vec3.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package MyGame.Example;
 
diff --git a/tests/MyGame/Example/Vec3.php b/tests/MyGame/Example/Vec3.php
index 022254ce9..ab1a82757 100644
--- a/tests/MyGame/Example/Vec3.php
+++ b/tests/MyGame/Example/Vec3.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace MyGame\Example;
 
diff --git a/tests/MyGame/Example/Vec3.py b/tests/MyGame/Example/Vec3.py
index c4ddfe230..a354773eb 100644
--- a/tests/MyGame/Example/Vec3.py
+++ b/tests/MyGame/Example/Vec3.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: Example
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.cs b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.cs
index e57e1dc7c..5f979fe54 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.cs
+++ b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA.NamespaceB
 {
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.go b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.go
index 4de2d0e3e..a1fe117c5 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.go
+++ b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceB
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.java b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.java
index a919ace6c..ff5559544 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.java
+++ b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA.NamespaceB;
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.php b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.php
index a39c0d731..d51cb41c4 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.php
+++ b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA\NamespaceB;
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.py b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.py
index 5de5be804..cb8218f0d 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.py
+++ b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: NamespaceB
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs
index 7317f2410..16b0f4585 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs
+++ b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA.NamespaceB
 {
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.go b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.go
index 66943e3cd..f3684623b 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.go
+++ b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceB
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.java b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.java
index dfbe23e8d..93f805224 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.java
+++ b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA.NamespaceB;
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.php b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.php
index 962ea2c6a..d3054841a 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.php
+++ b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA\NamespaceB;
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.py b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.py
index ae3f94024..59cceaa65 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.py
+++ b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: NamespaceB
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs
index dec8da9ee..b983cd0e4 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs
+++ b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA.NamespaceB
 {
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.go b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.go
index 09815c454..cf2b557c6 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.go
+++ b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceB
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.java b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.java
index 344005d5f..2cfb1bacc 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.java
+++ b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA.NamespaceB;
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.php b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.php
index 6bedae9d1..d16379d87 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.php
+++ b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA\NamespaceB;
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.py b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.py
index 834103bfe..e8e1f2ba7 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.py
+++ b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: NamespaceB
 
diff --git a/tests/namespace_test/NamespaceA/SecondTableInA.cs b/tests/namespace_test/NamespaceA/SecondTableInA.cs
index 11bf90fd7..96ae378fb 100644
--- a/tests/namespace_test/NamespaceA/SecondTableInA.cs
+++ b/tests/namespace_test/NamespaceA/SecondTableInA.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA
 {
diff --git a/tests/namespace_test/NamespaceA/SecondTableInA.go b/tests/namespace_test/NamespaceA/SecondTableInA.go
index 78514388a..efc7713f8 100644
--- a/tests/namespace_test/NamespaceA/SecondTableInA.go
+++ b/tests/namespace_test/NamespaceA/SecondTableInA.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA
 
diff --git a/tests/namespace_test/NamespaceA/SecondTableInA.java b/tests/namespace_test/NamespaceA/SecondTableInA.java
index b1fa7a7e0..acabc3931 100644
--- a/tests/namespace_test/NamespaceA/SecondTableInA.java
+++ b/tests/namespace_test/NamespaceA/SecondTableInA.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA;
 
diff --git a/tests/namespace_test/NamespaceA/SecondTableInA.php b/tests/namespace_test/NamespaceA/SecondTableInA.php
index 78dc27f53..c9bc65c15 100644
--- a/tests/namespace_test/NamespaceA/SecondTableInA.php
+++ b/tests/namespace_test/NamespaceA/SecondTableInA.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA;
 
diff --git a/tests/namespace_test/NamespaceA/SecondTableInA.py b/tests/namespace_test/NamespaceA/SecondTableInA.py
index f70153947..ab11701a2 100644
--- a/tests/namespace_test/NamespaceA/SecondTableInA.py
+++ b/tests/namespace_test/NamespaceA/SecondTableInA.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: NamespaceA
 
diff --git a/tests/namespace_test/NamespaceA/TableInC.cs b/tests/namespace_test/NamespaceA/TableInC.cs
index 19576df11..98f4e1383 100644
--- a/tests/namespace_test/NamespaceA/TableInC.cs
+++ b/tests/namespace_test/NamespaceA/TableInC.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA
 {
diff --git a/tests/namespace_test/NamespaceA/TableInC.go b/tests/namespace_test/NamespaceA/TableInC.go
index 535493f64..6f3d3f212 100644
--- a/tests/namespace_test/NamespaceA/TableInC.go
+++ b/tests/namespace_test/NamespaceA/TableInC.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA
 
diff --git a/tests/namespace_test/NamespaceA/TableInC.java b/tests/namespace_test/NamespaceA/TableInC.java
index 36e3cf192..38fb3ab30 100644
--- a/tests/namespace_test/NamespaceA/TableInC.java
+++ b/tests/namespace_test/NamespaceA/TableInC.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA;
 
diff --git a/tests/namespace_test/NamespaceA/TableInC.php b/tests/namespace_test/NamespaceA/TableInC.php
index e02226235..49705f820 100644
--- a/tests/namespace_test/NamespaceA/TableInC.php
+++ b/tests/namespace_test/NamespaceA/TableInC.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA;
 
diff --git a/tests/namespace_test/NamespaceA/TableInC.py b/tests/namespace_test/NamespaceA/TableInC.py
index bc101a7e3..4afea1af9 100644
--- a/tests/namespace_test/NamespaceA/TableInC.py
+++ b/tests/namespace_test/NamespaceA/TableInC.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: NamespaceA
 
diff --git a/tests/namespace_test/NamespaceA/TableInFirstNS.cs b/tests/namespace_test/NamespaceA/TableInFirstNS.cs
index a5f6ee27c..4b4be117e 100644
--- a/tests/namespace_test/NamespaceA/TableInFirstNS.cs
+++ b/tests/namespace_test/NamespaceA/TableInFirstNS.cs
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA
 {
diff --git a/tests/namespace_test/NamespaceA/TableInFirstNS.go b/tests/namespace_test/NamespaceA/TableInFirstNS.go
index 2f6f72676..5580d5d58 100644
--- a/tests/namespace_test/NamespaceA/TableInFirstNS.go
+++ b/tests/namespace_test/NamespaceA/TableInFirstNS.go
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA
 
diff --git a/tests/namespace_test/NamespaceA/TableInFirstNS.java b/tests/namespace_test/NamespaceA/TableInFirstNS.java
index c92c0f38e..873979307 100644
--- a/tests/namespace_test/NamespaceA/TableInFirstNS.java
+++ b/tests/namespace_test/NamespaceA/TableInFirstNS.java
@@ -1,4 +1,4 @@
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 package NamespaceA;
 
diff --git a/tests/namespace_test/NamespaceA/TableInFirstNS.php b/tests/namespace_test/NamespaceA/TableInFirstNS.php
index 57a827bc5..9fb29c370 100644
--- a/tests/namespace_test/NamespaceA/TableInFirstNS.php
+++ b/tests/namespace_test/NamespaceA/TableInFirstNS.php
@@ -1,5 +1,5 @@
 <?php
-// automatically generated, do not modify
+// automatically generated by the FlatBuffers compiler, do not modify
 
 namespace NamespaceA;
 
diff --git a/tests/namespace_test/NamespaceA/TableInFirstNS.py b/tests/namespace_test/NamespaceA/TableInFirstNS.py
index eb09014ce..3a652f495 100644
--- a/tests/namespace_test/NamespaceA/TableInFirstNS.py
+++ b/tests/namespace_test/NamespaceA/TableInFirstNS.py
@@ -1,4 +1,4 @@
-# automatically generated, do not modify
+# automatically generated by the FlatBuffers compiler, do not modify
 
 # namespace: NamespaceA
 
diff --git a/tests/test.cpp b/tests/test.cpp
index 73af97133..ca3ea03ab 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -868,6 +868,44 @@ void UnicodeTest() {
                      "\\u5225\\u30B5\\u30A4\\u30C8\\x01\\x80\"}", true);
 }
 
+void UnicodeSurrogatesTest() {
+  flatbuffers::Parser parser;
+
+  TEST_EQ(
+    parser.Parse(
+      "table T { F:string (id: 0); }"
+      "root_type T;"
+      "{ F:\"\\uD83D\\uDCA9\"}"), true);
+  auto root = flatbuffers::GetRoot<flatbuffers::Table>(
+    parser.builder_.GetBufferPointer());
+  auto string = root->GetPointer<flatbuffers::String *>(
+    flatbuffers::FieldIndexToOffset(0));
+  TEST_EQ(strcmp(string->c_str(), "\xF0\x9F\x92\xA9"), 0);
+}
+
+void UnicodeInvalidSurrogatesTest() {
+  TestError(
+    "table T { F:string; }"
+    "root_type T;"
+    "{ F:\"\\uD800\"}", "unpaired high surrogate");
+  TestError(
+    "table T { F:string; }"
+    "root_type T;"
+    "{ F:\"\\uD800abcd\"}", "unpaired high surrogate");
+  TestError(
+    "table T { F:string; }"
+    "root_type T;"
+    "{ F:\"\\uD800\\n\"}", "unpaired high surrogate");
+  TestError(
+    "table T { F:string; }"
+    "root_type T;"
+    "{ F:\"\\uD800\\uD800\"}", "multiple high surrogates");
+  TestError(
+    "table T { F:string; }"
+    "root_type T;"
+    "{ F:\"\\uDC00\"}", "unpaired low surrogate");
+}
+
 void UnknownFieldsTest() {
   flatbuffers::IDLOptions opts;
   opts.skip_unexpected_fields_in_json = true;
@@ -916,6 +954,8 @@ int main(int /*argc*/, const char * /*argv*/[]) {
   EnumStringsTest();
   IntegerOutOfRangeTest();
   UnicodeTest();
+  UnicodeSurrogatesTest();
+  UnicodeInvalidSurrogatesTest();
   UnknownFieldsTest();
 
   if (!testing_fails) {