3 files changed, 8 insertions, 3 deletions
diff --git a/lib/stdlib/src/erl_internal.erl b/lib/stdlib/src/erl_internal.erl
index 478f05e792..0b9b8b8e17 100644
--- a/lib/stdlib/src/erl_internal.erl
+++ b/lib/stdlib/src/erl_internal.erl
@@ -263,7 +263,6 @@ bif(bit_size, 1) -> true;
 bif(bitstring_to_list, 1) -> true;
 bif(byte_size, 1) -> true;
 bif(check_process_code, 2) -> true;
-bif(concat_binary, 1) -> true;
 bif(date, 0) -> true;
 bif(delete_module, 1) -> true;
 bif(demonitor, 1) -> true;
@@ -405,7 +404,6 @@ old_bif(bit_size, 1) -> true;
 old_bif(bitstring_to_list, 1) -> true;
 old_bif(byte_size, 1) -> true;
 old_bif(check_process_code, 2) -> true;
-old_bif(concat_binary, 1) -> true;
 old_bif(date, 0) -> true;
 old_bif(delete_module, 1) -> true;
 old_bif(disconnect_node, 1) -> true;
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index 39d017d430..db46670f61 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -449,7 +449,7 @@ obsolete_1(ssl_pkix, decode_cert, A) when A =:= 1; A =:= 2 ->
 
 %% Added in R13B04.
 obsolete_1(erlang, concat_binary, 1) ->
-    {deprecated,{erlang,list_to_binary,1},"R15B"};
+    {removed,{erlang,list_to_binary,1},"R15B"};
 
 %% Added in R14A.
 obsolete_1(ssl, peercert, 2) ->
@@ -461,6 +461,10 @@ obsolete_1(public_key, pem_to_der, 1) ->
 obsolete_1(public_key, decode_private_key, A) when A =:= 1; A =:= 2 ->
     {deprecated,{public_key,pem_entry_decode,1},"R15A"};
 
+%% Added in R15B
+obsolete_1(asn1rt, F, _) when F == load_driver; F == unload_driver ->
+    {deprecated,"deprecated (will be removed in R16A); has no effect as drivers are no longer used."};
+
 obsolete_1(_, _, _) ->
     no.
 
diff --git a/lib/stdlib/src/supervisor.erl b/lib/stdlib/src/supervisor.erl
index e60706ed05..023183c5f0 100644
--- a/lib/stdlib/src/supervisor.erl
+++ b/lib/stdlib/src/supervisor.erl
@@ -661,6 +661,9 @@ do_restart(_, normal, Child, State) ->
 do_restart(_, shutdown, Child, State) ->
     NState = state_del_child(Child, State),
     {ok, NState};
+do_restart(_, {shutdown, _Term}, Child, State) ->
+    NState = state_del_child(Child, State),
+    {ok, NState};
 do_restart(transient, Reason, Child, State) ->
     report_error(child_terminated, Reason, Child, State#state.name),
     restart(Child, State);