5 files changed, 19 insertions, 18 deletions
diff --git a/lib/compiler/src/cerl.erl b/lib/compiler/src/cerl.erl
index 8367a1e19e..ea960abc1a 100644
--- a/lib/compiler/src/cerl.erl
+++ b/lib/compiler/src/cerl.erl
@@ -256,7 +256,7 @@
 %% @see c_primop/2
 %% @see c_receive/1
 %% @see c_seq/2
-%% @see c_try/3
+%% @see c_try/5
 %% @see c_tuple/1
 %% @see c_values/1
 %% @see c_var/1
@@ -1456,7 +1456,7 @@ is_proper_list(_) ->
 %% X4]</code>.
 %%
 %% @see c_cons/2
-%% @see c_nil/1
+%% @see c_nil/0
 %% @see is_c_list/1
 %% @see list_length/1
 %% @see make_list/2
@@ -1487,7 +1487,7 @@ abstract_list([]) ->
 %% efficient.</p>
 %%
 %% @see c_cons/2
-%% @see c_nil/1
+%% @see c_nil/0
 %% @see is_c_list/1
 %% @see list_elements/1
 
@@ -1992,7 +1992,7 @@ update_c_fname(Node, Atom, Arity) ->
 %%
 %% @see c_fname/2
 %% @see c_var/1
-%% @see c_var_name/1
+%% @see var_name/1
 
 -spec is_c_fname(cerl()) -> boolean().
 
@@ -3670,7 +3670,7 @@ c_try(Expr, Vs, Body, Evs, Handler) ->
 %% @spec ann_c_try(As::[term()], Expression::cerl(),
 %%                 Variables::[cerl()], Body::cerl(),
 %%                 EVars::[cerl()], Handler::cerl()) -> cerl()
-%% @see c_try/3
+%% @see c_try/5
 
 -spec ann_c_try([term()], cerl(), [cerl()], cerl(), [cerl()], cerl()) ->
         c_try().
@@ -3683,7 +3683,7 @@ ann_c_try(As, Expr, Vs, Body, Evs, Handler) ->
 %% @spec update_c_try(Old::cerl(), Expression::cerl(),
 %%                    Variables::[cerl()], Body::cerl(),
 %%                    EVars::[cerl()], Handler::cerl()) -> cerl()
-%% @see c_try/3
+%% @see c_try/5
 
 -spec update_c_try(c_try(), cerl(), [cerl()], cerl(), [cerl()], cerl()) ->
         c_try().
@@ -3698,7 +3698,7 @@ update_c_try(Node, Expr, Vs, Body, Evs, Handler) ->
 %% @doc Returns <code>true</code> if <code>Node</code> is an abstract
 %% try-expression, otherwise <code>false</code>.
 %%
-%% @see c_try/3
+%% @see c_try/5
 
 -spec is_c_try(cerl()) -> boolean().
 
@@ -3712,7 +3712,7 @@ is_c_try(_) ->
 %%
 %% @doc Returns the expression subtree of an abstract try-expression.
 %%
-%% @see c_try/3
+%% @see c_try/5
 
 -spec try_arg(c_try()) -> cerl().
 
@@ -3725,7 +3725,7 @@ try_arg(Node) ->
 %% @doc Returns the list of success variable subtrees of an abstract
 %% try-expression.
 %%
-%% @see c_try/3
+%% @see c_try/5
 
 -spec try_vars(c_try()) -> [cerl()].
 
@@ -3737,7 +3737,7 @@ try_vars(Node) ->
 %%
 %% @doc Returns the success body subtree of an abstract try-expression.
 %%
-%% @see c_try/3
+%% @see c_try/5
 
 -spec try_body(c_try()) -> cerl().
 
@@ -3750,7 +3750,7 @@ try_body(Node) ->
 %% @doc Returns the list of exception variable subtrees of an abstract
 %% try-expression.
 %%
-%% @see c_try/3
+%% @see c_try/5
 
 -spec try_evars(c_try()) -> [cerl()].
 
@@ -3763,7 +3763,7 @@ try_evars(Node) ->
 %% @doc Returns the exception body subtree of an abstract
 %% try-expression.
 %%
-%% @see c_try/3
+%% @see c_try/5
 
 -spec try_handler(c_try()) -> cerl().
 
@@ -3785,7 +3785,7 @@ try_handler(Node) ->
 %% @see update_c_catch/2
 %% @see is_c_catch/1
 %% @see catch_body/1
-%% @see c_try/3
+%% @see c_try/5
 
 -spec c_catch(cerl()) -> c_catch().
 
diff --git a/lib/compiler/src/cerl_trees.erl b/lib/compiler/src/cerl_trees.erl
index b93da8e97f..f1bf0e02e7 100644
--- a/lib/compiler/src/cerl_trees.erl
+++ b/lib/compiler/src/cerl_trees.erl
@@ -19,7 +19,7 @@
 %% @doc Basic functions on Core Erlang abstract syntax trees.
 %%
 %% <p>Syntax trees are defined in the module <a
-%% href=""><code>cerl</code></a>.</p>
+%% href="cerl"><code>cerl</code></a>.</p>
 %%
 %% @type cerl() = cerl:cerl()
 
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl
index f347438509..c45c9a1a29 100644
--- a/lib/compiler/src/compile.erl
+++ b/lib/compiler/src/compile.erl
@@ -1295,8 +1295,9 @@ encrypt({des3_cbc=Type,Key,IVec,BlockSize}, Bin0) ->
     list_to_binary([0,length(TypeString),TypeString,Bin]).
 
 random_bytes(N) ->
-    {A,B,C} = now(),
-    _ = random:seed(A, B, C),
+    _ = random:seed(erlang:time_offset(),
+		    erlang:monotonic_time(),
+		    erlang:unique_integer()),
     random_bytes_1(N, []).
 
 random_bytes_1(0, Acc) -> Acc;
diff --git a/lib/compiler/src/compiler.app.src b/lib/compiler/src/compiler.app.src
index fbaa7a96fe..2a40c1c379 100644
--- a/lib/compiler/src/compiler.app.src
+++ b/lib/compiler/src/compiler.app.src
@@ -69,5 +69,5 @@
   {registered, []},
   {applications, [kernel, stdlib]},
   {env, []},
-  {runtime_dependencies, ["stdlib-2.0","kernel-3.0","hipe-3.10.3","erts-6.0",
+  {runtime_dependencies, ["stdlib-2.0","kernel-3.0","hipe-3.10.3","erts-7.0",
 			  "crypto-3.3"]}]}.
diff --git a/lib/compiler/test/map_SUITE.erl b/lib/compiler/test/map_SUITE.erl
index cfa8262701..1c9574c2a2 100644
--- a/lib/compiler/test/map_SUITE.erl
+++ b/lib/compiler/test/map_SUITE.erl
@@ -543,7 +543,7 @@ t_map_sort_literals(Config) when is_list(Config) ->
     true  = id(#{ c => 1, b => 1, a => 1 }) < id(#{ b => 1, c => 1, d => 1}),
     true  = id(#{ "a" => 1 }) < id(#{ <<"a">> => 1}),
     false = id(#{ <<"a">> => 1 }) < id(#{ "a" => 1}),
-    false = id(#{ 1 => 1 }) < id(#{ 1.0 => 1}),
+    true = id(#{ 1 => 1 }) < id(#{ 1.0 => 1}),
     false = id(#{ 1.0 => 1 }) < id(#{ 1 => 1}),
 
     %% value order