Merge commit 'b0258b9c27cb988766c2bc3637b7e5c53cb98f2f' into dev

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Author: samaaron

app/external/sp_link/src/sp_link.erl

@@ -1,5 +1,5 @@
 -module(sp_link).
--export([is_nif_loaded/0, is_nif_initialized/0, init_nif/1, deinit_nif/0, enable/1, is_enabled/0, set_tempo/2, get_tempo/0, get_num_peers/0,
+-export([init/0, is_nif_loaded/0, is_nif_initialized/0, init_nif/1, deinit_nif/0, enable/1, is_enabled/0, set_tempo/2, get_tempo/0, get_num_peers/0,
     start_stop_sync_enable/1, is_start_stop_sync_enabled/0, set_is_playing/2, is_playing/0, get_time_for_is_playing/0,
     get_beat_at_time/2, get_phase_at_time/2, get_time_at_beat/2, request_beat_at_time/3, force_beat_at_time/3,
     request_beat_at_start_playing_time/2, set_is_playing_and_request_beat_at_time/4, set_callback_pid/1,
@@ -23,9 +23,9 @@ init() ->
     erlang:load_nif(SoName, 0).
 
 is_nif_loaded() ->
-    exit(nif_library_not_loaded).
+    false.
 is_nif_initialized() ->
-    exit(nif_library_not_loaded).
+    false.
 init_nif(_) ->
     done.
 deinit_nif() ->