Merge pull request #1412 from google/internal

Integrate interanl changes

src/google/protobuf/compiler/js/js_generator.cc

@@ -489,6 +489,7 @@ string JSByteGetterSuffix(BytesMode bytes_mode) {
     default:
       assert(false);
   }
+  return "";
 }
 
 // Returns the field name as a capitalized portion of a getter/setter method

src/google/protobuf/text_format_unittest.cc

@@ -53,11 +53,11 @@
 #include <google/protobuf/unittest_mset_wire_format.pb.h>
 #include <google/protobuf/io/tokenizer.h>
 #include <google/protobuf/io/zero_copy_stream_impl.h>
+#include <google/protobuf/stubs/mathlimits.h>
 #include <google/protobuf/stubs/strutil.h>
 #include <google/protobuf/stubs/substitute.h>
 #include <google/protobuf/testing/googletest.h>
 #include <gtest/gtest.h>
-#include <google/protobuf/stubs/mathlimits.h>
 
 
 namespace google {