Merge branch 'master' into divVerent/crypto2

Conflicts:
	all

diff --cc all
index 2bc1bf9bf5ffbe6e1e89802bf73465b8aa22c195,3e120e5b86d489f26a2d9a6c31836ab091141c5d..64a28e58719d8f9535caa6277a9ff6531d0c4cef
--- 1/all
--- 2/all
+++ b/all
@@@ -607,9 -593,9 +607,9 @@@ case "$cmd" i
        run)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        client=
-                       export PATH="$d0/misc/buildfiles/win64:$d0/misc/buildfiles/win32:$d0/d0_blind_id/.libs:$PATH"
 -                      export PATH="$d0/misc/buildfiles/win32:$PATH"
++                      export PATH="$d0/misc/buildfiles/win32:$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