Merge branch 'maint-23' into maint

* maint-23:
  Updated OTP version
  Prepare release

# Conflicts:
#	make/otp_version_tickets

5 files changed, 43 insertions, 3 deletions

diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index 395abfcada..c7a1ad4f87 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -37,7 +37,23 @@
   section is the version number of Megaco.</p>
 
 
-  <section><title>Megaco 3.19.1</title>
+  <section><title>Megaco 3.19.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The v2 and v3 parsers could not properly decode some IPv6
+	    addresses.</p>
+          <p>
+	    Own Id: OTP-16818 Aux Id: ERIERL-526 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Megaco 3.19.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk
index 12713ddf07..adc91fdd26 100644
--- a/lib/megaco/vsn.mk
+++ b/lib/megaco/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = megaco
-MEGACO_VSN  = 3.19.1
+MEGACO_VSN  = 3.19.2
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)"
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 24a8d4c089..a2ad8c6fa2 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -31,6 +31,26 @@
   </header>
   <p>This document describes the changes made to the STDLIB application.</p>
 
+<section><title>STDLIB 3.13.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>When a temporary child of a <c>simple_one_for_one
+	    supervisor</c> died, the internal state of the supervisor
+	    would be corrupted in a way that would cause the
+	    supervisor to retain the start arguments for subsequent
+	    children started by the supervisor, causing unnecessary
+	    growth of the supervisor's heap. There state corruption
+	    could potentially cause other problems as well.</p>
+          <p>
+	    Own Id: OTP-16804</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>STDLIB 3.13</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index 85fba9ebbd..5038e9e970 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -37,6 +37,8 @@
   {<<"^3\\.12$">>,[restart_new_emulator]},
   {<<"^3\\.12\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.12\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.13$">>,[restart_new_emulator]},
+  {<<"^3\\.13\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.5$">>,[restart_new_emulator]},
   {<<"^3\\.5\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.5\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -62,6 +64,8 @@
   {<<"^3\\.12$">>,[restart_new_emulator]},
   {<<"^3\\.12\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.12\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.13$">>,[restart_new_emulator]},
+  {<<"^3\\.13\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.5$">>,[restart_new_emulator]},
   {<<"^3\\.5\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.5\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index 3aa3690d12..169a4d8f0b 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 3.13
+STDLIB_VSN = 3.13.1