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

2 files changed, 106 insertions, 1 deletions

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 5a65115cb2..5cb9bdb690 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -32,6 +32,111 @@
   <p>This document describes the changes made to the ERTS application.</p>
 
 
+<section><title>Erts 7.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Small documentation fixes</p>
+          <p>
+	    Own Id: OTP-13017</p>
+        </item>
+        <item>
+          <p>
+	    Fix memory corruption bug caused by disabling
+	    distribution and then re-enable distribution with a node
+	    name that has previously been used by a remote node.</p>
+          <p>
+	    Own Id: OTP-13076 Aux Id: seq12959 </p>
+        </item>
+        <item>
+          <p>
+	    Renamed variables with name bool as Visual Studio 2015
+	    now treats this is a keyword.</p>
+          <p>
+	    Own Id: OTP-13079</p>
+        </item>
+        <item>
+	    <p><c>erl_prim_loader</c> has not supported custom
+	    loaders for several releases. In the documentation for
+	    <c>erl_prim_loader</c>, all references to custom loaders
+	    have now been removed.</p>
+          <p>
+	    Own Id: OTP-13102</p>
+        </item>
+        <item>
+          <p>
+	    Fixed compilation of erts together with libc versions
+	    that do not define __uint32_t.</p>
+          <p>
+	    Own Id: OTP-13105</p>
+        </item>
+        <item>
+          <p>
+	    erl -make now returns non-zero exit codes on failure</p>
+          <p>
+	    Own Id: OTP-13107</p>
+        </item>
+        <item>
+          <p>
+	    Fix crash on init:restart in embedded mode caused by
+	    on_load handler process not being relaunched leading to
+	    load failure for modules such as crypto and asn1rt_nif
+	    that need it to be present for correct NIF loading.</p>
+          <p>
+	    Own Id: OTP-13115</p>
+        </item>
+        <item>
+          <p>
+	    Fix maps decode in erlang:binary_to_term/1</p>
+	    <p>Decoding a term with a large (HAMT) map in an small
+	    (FLAT) map could cause a critical error if the external
+	    format was not produced by beam.</p>
+          <p>
+	    Own Id: OTP-13125</p>
+        </item>
+        <item>
+          <p>
+	    Fix very rare bug in GC when big maps with a lot of hash
+	    collisions from a remote node are waiting in inner
+	    message queue.</p>
+          <p>
+	    Own Id: OTP-13146</p>
+        </item>
+        <item>
+          <p>
+	    Fixed a bug that could cause a crash dump to become
+	    almost empty.</p>
+          <p>
+	    Own Id: OTP-13150</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Updated the xmllint target to just check the xml
+	    files with real documentation content.<br/> Corrected
+	    some errors and added some missing target in the DTD's.
+	    </p>
+          <p>
+	    Own Id: OTP-13026</p>
+        </item>
+        <item>
+          <p>
+	    Add function enif_getenv to read OS environment variables
+	    in a portable way from NIFs.</p>
+          <p>
+	    Own Id: OTP-13147</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 7.1</title>
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 140baeb846..be6cf2e376 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 7.1
+VSN = 7.2
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3