Merge branch 'master' into dynamic_alloc_dev

Conflicts:
	tests/Makefile
	tests/test_encode1.c

pb_encode.c

@@ -389,6 +389,7 @@ bool checkreturn pb_enc_submessage(pb_ostream_t *stream, const pb_field_t *field
     status = pb_encode(&substream, (const pb_message_t*)field->ptr, src);
     
     stream->bytes_written += substream.bytes_written;
+    stream->state = substream.state;
     
     if (substream.bytes_written != size)
         return false;