Merge branch 'maint-22' into maint

* maint-22:
  Updated OTP version
  Prepare release

# Conflicts:
#	make/otp_version_tickets

2 files changed, 37 insertions, 1 deletions

diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml
index 62ea389edf..dc509bbf60 100644
--- a/lib/compiler/doc/src/notes.xml
+++ b/lib/compiler/doc/src/notes.xml
@@ -32,6 +32,42 @@
   <p>This document describes the changes made to the Compiler
     application.</p>
 
+<section><title>Compiler 7.5.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixed a bug that could cause the compiler to reject
+	    valid code that used the <c>is_map_key/2</c> BIF.</p>
+          <p>
+	    Own Id: OTP-16452 Aux Id: ERL-1161 </p>
+        </item>
+        <item>
+	    <p>Fixed a bug that could cause the compiler to reject
+	    valid code that matched the same map key several
+	    times.</p>
+          <p>
+	    Own Id: OTP-16456 Aux Id: ERL-1163 </p>
+        </item>
+        <item>
+	    <p>The compiler could crash when compiling a convoluted
+	    <c>receive</c> statement.</p>
+          <p>
+	    Own Id: OTP-16466 Aux Id: ERL-1170 </p>
+        </item>
+        <item>
+	    <p>The compiler could crash when a fun was created but
+	    never used.</p>
+	    <p>The compiler could crash when compiling the expression
+	    <c>true = 0 / X</c>.</p>
+          <p>
+	    Own Id: OTP-16467 Aux Id: ERL-1166, ERL-1167 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Compiler 7.5.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk
index 8da9ebb211..87cb90522c 100644
--- a/lib/compiler/vsn.mk
+++ b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 7.5.1
+COMPILER_VSN = 7.5.2