Merge branch 'master' into io

.travis.yml

@@ -23,7 +23,7 @@ addons:
     - p7zip-full
 
 before_script:
-  - mkdir $HOME/srb2_cache
+  - mkdir -p $HOME/srb2_cache
   - wget --verbose --server-response -c http://rosenthalcastle.org/srb2/SRB2-v2114-assets.7z -O $HOME/srb2_cache/SRB2-v2114-assets.7z
   - 7z x $HOME/srb2_cache/SRB2-v2114-assets.7z -oassets
   - mkdir build

src/f_finale.c

@@ -1069,7 +1069,7 @@ static const char *credits[] = {
 	"iD Software",
 	"Alex \"MistaED\" Fuller",
 	"FreeDoom Project", // Used some of the mancubus and rocket launcher sprites for Brak
-	"Randy Heit (<!>)", // For his MSPaint <!> sprite that we nicked
+	"Randi Heit (<!>)", // For their MSPaint <!> sprite that we nicked
 	"",
 	"\1Produced By",
 	"Sonic Team Junior",