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

diff --cc all
index fff4d56e38e8182c244851c0adf12d58ed2a8233,317f775987a00e72d69c1096dfe1240960e72725..2592fde5e36e60cb491f69b7cb91e7eeb0d2429c
--- 1/all
--- 2/all
+++ b/all
@@@ -1263,10 -1285,9 +1301,10 @@@ case "$cmd" i
                        Xonotic/misc \
                        Xonotic/fteqcc \
                        Xonotic/server \
 +                      Xonotic/key_0.d0pk \
                        Xonotic/data/font-nimbussansl-$stamp.pk3
                verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip
-               verbose zip -0yr Xonotic-$stamp.zip \
+               verbose mkzip0 Xonotic-$stamp.zip \
                        Xonotic/data/xonotic-$stamp-data.pk3 \
                        Xonotic/data/xonotic-$stamp-maps.pk3 \
                        Xonotic/data/xonotic-$stamp-music.pk3 \