Merge remote branch 'origin/master' into divVerent/crypto2

Conflicts:
	all

diff --cc all
index e62d477af4a63ed4726675cc1fdf6878b3781a9f,933a51b6e78259583b56f9e06e2ca6ef1000d6e4..d85c09701ec77e6c6f76fb28d4c6098e383693b8
--- 1/all
--- 2/all
+++ b/all
@@@ -523,12 -516,12 +530,13 @@@ case "$cmd" i
        run)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        client=
 -                      export PATH="$d0/misc/buildfiles/w32:$PATH"
 +                      export PATH="$d0/misc/buildfiles/w32:$d0/d0_blind_id/.libs/$PATH"
                elif [ x"`uname`" = x"Darwin" ]; then
 -                      export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
 +                      export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS:$d0/d0_blind_id/.libs"
+                       export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
                        client=-sdl
                else
 +                      export LD_LIBRARY_PATH="$d0/d0_blind_id/.libs"
                        client=-sdl
                fi
                case "$1" in