Merge tag 'OTP-17.1'

=== OTP-17.1 ===

Changed Applications:
- asn1-3.0.1
- common_test-1.8.1
- compiler-5.0.1
- crypto-3.4
- debugger-4.0.1
- dialyzer-2.7.1
- diameter-1.7
- erl_interface-3.7.17
- erts-6.1
- hipe-3.11
- inets-5.10.2
- kernel-3.0.1
- mnesia-4.12.1
- observer-2.0.1
- reltool-0.6.6
- ssh-3.0.3
- ssl-5.3.5
- stdlib-2.1
- syntax_tools-1.6.15
- test_server-3.7.1
- tools-2.6.15
- typer-0.9.8
- wx-1.3

Unchanged Applications:
- cosEvent-2.1.15
- cosEventDomain-1.1.14
- cosFileTransfer-1.1.16
- cosNotification-1.1.21
- cosProperty-1.1.17
- cosTime-1.1.14
- cosTransactions-1.2.14
- edoc-0.7.13
- eldap-1.0.3
- erl_docgen-0.3.5
- et-1.5
- eunit-2.2.7
- gs-1.5.16
- ic-4.3.5
- jinterface-1.5.9
- megaco-3.17.1
- odbc-2.10.20
- orber-3.6.27
- os_mon-2.2.15
- ose-1.0
- otp_mibs-1.0.9
- parsetools-2.0.11
- percept-0.8.9
- public_key-0.22
- runtime_tools-1.8.14
- sasl-2.4
- snmp-4.25.1
- webtool-0.8.10
- xmerl-1.3.7

2 files changed, 53 insertions, 1 deletions

diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index c6538b7d05..3a8de841d0 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -30,6 +30,58 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</p>
 
+<section><title>Kernel 3.0.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    If the Config given to
+	    application_controller:change_application_data included
+	    other config files, it was only expanded for already
+	    existing (loaded) applications. If an upgrade added a new
+	    application which had config data in an included config
+	    file, the new application did not get correct config
+	    data.</p>
+          <p>
+	    This is now changed so config data will be expanded for
+	    all applications.</p>
+          <p>
+	    Own Id: OTP-11864</p>
+        </item>
+        <item>
+	    <p>It was allowed to re-load pre-loaded modules such as
+	    <c>erlang</c>, but that could cause strange and unwanted
+	    things to happen, such as call <c>apply/3</c> to loop.
+	    Pre-loaded modules are now sticky by default. (Thanks to
+	    Loïc Hoguin for reporting this bug.)</p>
+	    <p><c>code:add_path("/ending/in/slash/")</c> removes the
+	    trailing slash, adding <c>/ending/in/slash</c> to the
+	    code path. However,
+	    <c>code:del_path("/ending/in/slash/")</c> would fail to
+	    remove the path since it did not remove the trailing
+	    slash. This has been fixed.</p>
+          <p>
+	    Own Id: OTP-11913</p>
+        </item>
+        <item>
+          <p>
+	    Fix erts_debug:size/1 to handle Map sizes</p>
+          <p>
+	    Own Id: OTP-11923</p>
+        </item>
+        <item>
+	    <p>The documentation for <c>file:file_info/1</c> has been
+	    removed. The function itself was removed a long time
+	    ago.</p>
+          <p>
+	    Own Id: OTP-11982</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 3.0</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index dd5316b825..aebe28655e 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 3.0
+KERNEL_VSN = 3.0.1