Merge remote-tracking branch 'github/master'

(fixed comment in NativeLib.java)

diff --cc src/bindings/java/org/simgrid/NativeLib.java
index d452dfe,b67462e..9592f82
--- 1/src/bindings/java/org/simgrid/NativeLib.java
--- 2/src/bindings/java/org/simgrid/NativeLib.java
+++ b/src/bindings/java/org/simgrid/NativeLib.java
@@@ -163,9 -163,9 +163,9 @@@ public final class NativeLib 
                public void run() {
                        try {
                                for (File f : dir.listFiles())
-                                       if (! f.delete() && !f.getAbsolutePath().contains("appveyor")) // Be silent on AppVeyor to not break the tests. Ugly trick :)
 -                                      if (! f.delete() && !f.getAbsolutePath().contains("travis")) // Be silent on AppVeyor to not break the tests. Ugly trick :)
++                                      if (! f.delete() && !f.getAbsolutePath().contains("travis")) // Be silent on Travis to not break the tests. Ugly trick :)
                                                System.out.println("Unable to clean temporary file "+f.getAbsolutePath()+" during shutdown.");
-                               if (! dir.delete() && !dir.getAbsolutePath().contains("appveyor") )
+                               if (! dir.delete() && !dir.getAbsolutePath().contains("travis") )
                                        System.out.println("Unable to clean temporary file "+dir.getAbsolutePath()+" during shutdown.");                                
                        } catch(Exception e) {
                                System.out.println("Error while cleaning temporary file "+dir.getAbsolutePath()+" during shutdown: "+e.getCause());