Merge latest Xonotic Git (note: untested)