Merge remote-tracking branch 'origin/master' into master

src/gen_emm.erl

@@ -180,7 +180,7 @@ start(ServerName, Opts) ->
 start_link() ->
    gen:start(?MODULE, link, ?MODULE, [], []).
 
--spec start_link(ServerName :: serverName() | Opts :: [startOpt()]) -> startRet().
+-spec start_link(ServerName :: serverName() | [startOpt()]) -> startRet().
 start_link(ServerName) when is_tuple(ServerName) ->
    gen:start(?MODULE, link, ServerName, ?MODULE, [], []);
 start_link(Opts) when is_list(Opts) ->