diff --git a/Doc/Manual/Warnings.html b/Doc/Manual/Warnings.html
index 3ec1af757..89a8375a5 100644
--- a/Doc/Manual/Warnings.html
+++ b/Doc/Manual/Warnings.html
@@ -546,7 +546,7 @@ example.i(4) : Syntax error in input(1).
 <li>810. No jni typemap defined for <em>type</em>  (Java).
 <li>811. No jtype typemap defined for <em>type</em>  (Java).
 <li>812. No jstype typemap defined for <em>type</em>  (Java).
-<li>813. Warning for <em>classname</em>: Base <em>baseclass</em> ignored. Multiple inheritance is not supported in Java.   (Java).
+<li>813. Warning for <em>classname</em>, base <em>baseclass</em> ignored. Multiple inheritance is not supported in Java.   (Java).
 <li>814. 
 <li>815. No javafinalize typemap defined for <em>type</em>  (Java).
 <li>816. No javabody typemap defined for <em>type</em>  (Java).
@@ -566,7 +566,7 @@ example.i(4) : Syntax error in input(1).
 <li>830. No ctype typemap defined for <em>type</em>  (C#).
 <li>831. No cstype typemap defined for <em>type</em>  (C#).
 <li>832. No cswtype typemap defined for <em>type</em>  (C#).
-<li>833. Warning for <em>classname</em>: Base <em>baseclass</em> ignored. Multiple inheritance is not supported in C#.   (C#).
+<li>833. Warning for <em>classname</em>, base <em>baseclass</em> ignored. Multiple inheritance is not supported in C#.   (C#).
 <li>834. 
 <li>835. No csfinalize typemap defined for <em>type</em>  (C#).
 <li>836. No csbody typemap defined for <em>type</em>  (C#).
@@ -582,7 +582,7 @@ example.i(4) : Syntax error in input(1).
 </ul>
 
 <ul>
-<li>870. Warning for <em>classname</em>: Base <em>baseclass</em> ignored. Multiple inheritance is not supported in PHP.
+<li>870. Warning for <em>classname</em>: Base <em>baseclass</em> ignored. Multiple inheritance is not supported in PHP.   (Php).
 <li>871. Unrecognized pragma <em>pragma</em>.   (Php).
 </ul>
 
diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx
index 343608343..5e1529325 100644
--- a/Source/Modules/csharp.cxx
+++ b/Source/Modules/csharp.cxx
@@ -1768,7 +1768,7 @@ public:
 	      /* Warn about multiple inheritance for additional base class(es) */
 	      String *proxyclassname = Getattr(n, "classtypeobj");
 	      Swig_warning(WARN_CSHARP_MULTIPLE_INHERITANCE, Getfile(n), Getline(n),
-		  "Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in C#.\n", SwigType_namestr(proxyclassname), SwigType_namestr(baseclassname));
+		  "Warning for %s, base %s ignored. Multiple inheritance is not supported in C#.\n", SwigType_namestr(proxyclassname), SwigType_namestr(baseclassname));
 	    }
 	  }
 	  base = Next(base);
@@ -1793,7 +1793,7 @@ public:
         Swig_error(Getfile(n), Getline(n), "The csbase typemap for proxy %s must contain just one of the 'replace' or 'notderived' attributes.\n", typemap_lookup_type);
     } else if (Len(pure_baseclass) > 0 && Len(baseclass) > 0) {
       Swig_warning(WARN_CSHARP_MULTIPLE_INHERITANCE, Getfile(n), Getline(n),
-		   "Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in C#. "
+		   "Warning for %s, base %s ignored. Multiple inheritance is not supported in C#. "
 		   "Perhaps you need one of the 'replace' or 'notderived' attributes in the csbase typemap?\n", typemap_lookup_type, pure_baseclass);
     }
 
diff --git a/Source/Modules/d.cxx b/Source/Modules/d.cxx
index 834d227e2..b7b8313b4 100644
--- a/Source/Modules/d.cxx
+++ b/Source/Modules/d.cxx
@@ -3164,7 +3164,7 @@ private:
       }
     } else if (basename && Len(pure_baseclass) > 0) {
       Swig_warning(WARN_D_MULTIPLE_INHERITANCE, Getfile(n), Getline(n),
-	"Warning for %s proxy: Base class %s ignored. Multiple inheritance is not supported in D. "
+	"Warning for %s, base class %s ignored. Multiple inheritance is not supported in D. "
 	"Perhaps you need one of the 'replace' or 'notderived' attributes in the dbase typemap?\n", typemap_lookup_type, pure_baseclass);
     }
 
diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx
index e9fb3d3f3..942bc0319 100644
--- a/Source/Modules/java.cxx
+++ b/Source/Modules/java.cxx
@@ -1856,7 +1856,7 @@ public:
 	      /* Warn about multiple inheritance for additional base class(es) */
 	      String *proxyclassname = Getattr(n, "classtypeobj");
 	      Swig_warning(WARN_JAVA_MULTIPLE_INHERITANCE, Getfile(n), Getline(n),
-		  "Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in Java.\n", SwigType_namestr(proxyclassname), SwigType_namestr(baseclassname));
+		  "Warning for %s, base %s ignored. Multiple inheritance is not supported in Java.\n", SwigType_namestr(proxyclassname), SwigType_namestr(baseclassname));
 	    }
 	  }
 	  base = Next(base);
@@ -1882,7 +1882,7 @@ public:
         Swig_error(Getfile(n), Getline(n), "The javabase typemap for proxy %s must contain just one of the 'replace' or 'notderived' attributes.\n", typemap_lookup_type);
     } else if (Len(pure_baseclass) > 0 && Len(baseclass) > 0) {
       Swig_warning(WARN_JAVA_MULTIPLE_INHERITANCE, Getfile(n), Getline(n),
-		   "Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in Java. "
+		   "Warning for %s, base %s ignored. Multiple inheritance is not supported in Java. "
 		   "Perhaps you need one of the 'replace' or 'notderived' attributes in the javabase typemap?\n", typemap_lookup_type, pure_baseclass);
     }
 
diff --git a/Source/Modules/modula3.cxx b/Source/Modules/modula3.cxx
index 940b6ebcb..9983e69d2 100644
--- a/Source/Modules/modula3.cxx
+++ b/Source/Modules/modula3.cxx
@@ -2190,7 +2190,7 @@ MODULA3():
 	    /* Warn about multiple inheritance for additional base class(es) */
 	    String *proxyclassname = Getattr(n, "classtypeobj");
 	    Swig_warning(WARN_MODULA3_MULTIPLE_INHERITANCE, Getfile(n), Getline(n),
-		"Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in Java.\n", SwigType_namestr(proxyclassname), SwigType_namestr(baseclassname));
+		"Warning for %s, base %s ignored. Multiple inheritance is not supported in Modula 3.\n", SwigType_namestr(proxyclassname), SwigType_namestr(baseclassname));
 	  }
 	}
 	base = Next(base);
@@ -2205,7 +2205,7 @@ MODULA3():
     const String *pure_baseclass = typemapLookup(n, "m3base", name, WARN_NONE);
     if (hasContent(pure_baseclass) && hasContent(baseclass)) {
       Swig_warning(WARN_MODULA3_MULTIPLE_INHERITANCE, Getfile(n), Getline(n),
-		   "Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in Modula 3.\n", name, pure_baseclass);
+		   "Warning for %s, base %s ignored. Multiple inheritance is not supported in Modula 3.\n", name, pure_baseclass);
     }
     // Pure Modula 3 interfaces
     const String *pure_interfaces = typemapLookup(n, derived ? "m3interfaces_derived" : "m3interfaces",
@@ -2435,7 +2435,7 @@ MODULA3():
 	      base = Next(base);
 	      if (base.item) {
 		Swig_warning(WARN_MODULA3_MULTIPLE_INHERITANCE, Getfile(n), Getline(n),
-		    "Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in Modula 3.\n",
+		    "Warning for %s, base %s ignored. Multiple inheritance is not supported in Modula 3.\n",
 		    proxy_class_name, Getattr(base.item, "name"));
 	      }
 	    }
diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx
index fbece2715..230d9d13f 100644
--- a/Source/Modules/php.cxx
+++ b/Source/Modules/php.cxx
@@ -2018,7 +2018,7 @@ done:
 	    String *proxyclassname = SwigType_str(Getattr(n, "classtypeobj"), 0);
 	    String *baseclassname = SwigType_str(Getattr(base.item, "name"), 0);
 	    Swig_warning(WARN_PHP_MULTIPLE_INHERITANCE, input_file, line_number,
-			 "Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in PHP.\n", proxyclassname, baseclassname);
+			 "Warning for %s, base %s ignored. Multiple inheritance is not supported in PHP.\n", proxyclassname, baseclassname);
 	    base = Next(base);
 	  }
 	}
diff --git a/Source/Modules/ruby.cxx b/Source/Modules/ruby.cxx
index 62a6d960c..ddf47c1b0 100644
--- a/Source/Modules/ruby.cxx
+++ b/Source/Modules/ruby.cxx
@@ -2473,7 +2473,7 @@ public:
 	    String *proxyclassname = SwigType_str(Getattr(n, "classtypeobj"), 0);
 	    String *baseclassname = SwigType_str(Getattr(base.item, "name"), 0);
 	    Swig_warning(WARN_RUBY_MULTIPLE_INHERITANCE, Getfile(n), Getline(n),
-			 "Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in Ruby.\n", proxyclassname, baseclassname);
+			 "Warning for %s, base %s ignored. Multiple inheritance is not supported in Ruby.\n", proxyclassname, baseclassname);
 	    base = Next(base);
 	  }
 	}