Merge branch 'maint'

* maint:
  Updated OTP version
  Update release notes
  Update version numbers
  ssh: Fix bad spec for double_algs() in ssh.hrl
  Test event insert from init
  Fix init to allow all actions

Conflicts:
	OTP_VERSION

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/stdlib/src/gen_statem.erl b/lib/stdlib/src/gen_statem.erl
index 9dc360a289..7f5d82cc21 100644
--- a/lib/stdlib/src/gen_statem.erl
+++ b/lib/stdlib/src/gen_statem.erl
@@ -669,9 +669,9 @@ enter(Module, Opts, State, Data, Server, Actions, Parent) ->
     NewDebug = ?sys_debug(Debug, {Name,State}, {enter,Event,State}),
     case call_callback_mode(S) of
 	#state{} = NewS ->
-	    loop_event_actions(
+	    loop_event_actions_list(
 	      Parent, NewDebug, NewS,
-	      Events, Event, State, Data, #trans_opts{},
+	      Events, Event, State, Data, false,
               NewActions, CallEnter);
 	[Class,Reason,Stacktrace] ->
 	    terminate(
@@ -1286,7 +1286,7 @@ parse_actions_next_event(
                 next_events_r = [{Type,Content}|NextEventsR]});
         _ ->
             [error,
-             {bad_action_from_state_function,{next_events,Type,Content}},
+             {bad_action_from_state_function,{next_event,Type,Content}},
              ?STACKTRACE(),
              ?not_sys_debug]
     end;
@@ -1303,7 +1303,7 @@ parse_actions_next_event(
                 next_events_r = [{Type,Content}|NextEventsR]});
         _ ->
             [error,
-             {bad_action_from_state_function,{next_events,Type,Content}},
+             {bad_action_from_state_function,{next_event,Type,Content}},
              ?STACKTRACE(),
              Debug]
     end.