Merge branch 'master' into maintenance_0.3

docs/migration.rst

@@ -18,14 +18,14 @@ Fix handling of string and bytes default values
 -----------------------------------------------
 
 **Rationale:** Previously nanopb didn't properly decode special character
-escapes like \200 emitted by protoc. This caused these escapes to end up
+escapes like \\200 emitted by protoc. This caused these escapes to end up
 verbatim in the default values in .pb.c file.
 
-**Changes:** Escapes are now decoded, and e.g. "\200" or "\x80" results in
-{0x80} for bytes field and "\x80" for string field.
+**Changes:** Escapes are now decoded, and e.g. "\\200" or "\\x80" results in
+{0x80} for bytes field and "\\x80" for string field.
 
-**Required actions:** If code has previously relied on '\' in default value
-being passed through verbatim, it must now be changed to '\\'.
+**Required actions:** If code has previously relied on '\\' in default value
+being passed through verbatim, it must now be changed to '\\\\'.
 
 Nanopb-0.3.8 (2017-03-05)
 =========================