Merge branch 'master' into jgrpp

# Conflicts:
#	src/lang/galician.txt

src/industry_cmd.cpp

@@ -2192,7 +2192,7 @@ CommandCost CmdIndustryCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
 		}
 
 		default:
-			NOT_REACHED();
+			return CMD_ERROR;
 	}
 
 	return CommandCost();