Merge tag 'OTP-18.2' into maint

=== OTP-18.2 ===

Changed Applications:
- asn1-4.0.1
- common_test-1.11.1
- compiler-6.0.2
- crypto-3.6.2
- dialyzer-2.8.2
- diameter-1.11.1
- erl_docgen-0.4.1
- erl_interface-3.8.1
- erts-7.2
- eunit-2.2.12
- hipe-3.14
- inets-6.1
- jinterface-1.6.1
- kernel-4.1.1
- observer-2.1.1
- parsetools-2.1.1
- public_key-1.1
- runtime_tools-1.9.2
- sasl-2.6.1
- snmp-5.2.1
- ssh-4.2
- ssl-7.2
- stdlib-2.7
- test_server-3.9.1
- tools-2.8.2
- typer-0.9.10
- wx-1.6
- xmerl-1.3.9

Unchanged Applications:
- cosEvent-2.2
- cosEventDomain-1.2
- cosFileTransfer-1.2
- cosNotification-1.2
- cosProperty-1.2
- cosTime-1.2
- cosTransactions-1.3
- debugger-4.1.1
- edoc-0.7.17
- eldap-1.2
- et-1.5.1
- gs-1.6
- ic-4.4
- megaco-3.18
- mnesia-4.13.2
- odbc-2.11.1
- orber-3.8
- os_mon-2.4
- ose-1.1
- otp_mibs-1.1
- percept-0.8.11
- reltool-0.7
- syntax_tools-1.7
- webtool-0.9

3 files changed, 66 insertions, 5 deletions

diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index c84ca9c8ad..267a993a1b 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -31,6 +31,67 @@
   </header>
   <p>This document describes the changes made to the STDLIB application.</p>
 
+<section><title>STDLIB 2.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>The Erlang Pretty Printer uses <c>::</c> for function
+	    type constraints.</p> <p>A bug concerning pretty printing
+	    of annotated type union elements in map pair types has
+	    been fixed.</p> <p>Some minor issues regarding the
+	    documentation of types and specs have been corrected.</p>
+          <p>
+	    Own Id: OTP-13084</p>
+        </item>
+        <item>
+	    <p> The shell command <c>rp</c> prints strings as lists
+	    of integers if pretty printing of lists is set to
+	    <c>false</c>. </p>
+          <p>
+	    Own Id: OTP-13145</p>
+        </item>
+        <item>
+          <p>
+	    The shell would crash if a bit syntax expression with
+	    conflicting types were given (e.g. if a field type was
+	    given as '<c>integer-binary</c>'). (Thanks to Aleksei
+	    Magusev for reporting this bug.)</p>
+          <p>
+	    Own Id: OTP-13157</p>
+        </item>
+        <item>
+	    <p>The <c>rand:export_seed/0</c> would never return
+	    '<c>undefined</c>' even if no seed has previously been
+	    created. Fixed to return '<c>undefined</c>' if there is
+	    no seed in the process dictionary.</p>
+          <p>
+	    Own Id: OTP-13162</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add support for the Delete, Home and End keys in the
+	    Erlang shell.</p>
+          <p>
+	    Own Id: OTP-13032</p>
+        </item>
+        <item>
+	    <p><c>beam_lib:all_chunks/1</c> and
+	    <c>beam_lib:build_module/1</c> have been documented.</p>
+          <p>
+	    Own Id: OTP-13063</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>STDLIB 2.6</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 5f61752655..04cdf31ada 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -18,9 +18,9 @@
 %% %CopyrightEnd%
 {"%VSN%",
  %% Up from - max one major revision back
- [{<<"2\\.5(\\.[0-9]+)*">>,[restart_new_emulator]},      %% OTP-18.0.*
-  {<<"2\\.[0-4](\\.[0-9]+)*">>,[restart_new_emulator]}], %% 17.0-17.5
+ [{<<"2\\.[5-7](\\.[0-9]+)*">>,[restart_new_emulator]},  % OTP-18.*
+  {<<"2\\.[0-4](\\.[0-9]+)*">>,[restart_new_emulator]}], % 17.0-17.5
  %% Down to - max one major revision back
- [{<<"2\\.5(\\.[0-9]+)*">>,[restart_new_emulator]},      %% OTP-18.0.*
-  {<<"2\\.[0-4](\\.[0-9]+)*">>,[restart_new_emulator]}]  %% 17.0-17.5
+ [{<<"2\\.[5-7](\\.[0-9]+)*">>,[restart_new_emulator]},  % OTP-18.*
+  {<<"2\\.[0-4](\\.[0-9]+)*">>,[restart_new_emulator]}]  % 17.0-17.5
 }.
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index 3387d74e57..39b44c9104 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 2.6
+STDLIB_VSN = 2.7