Merge origin/master to prepare the integration

Conflicts:
	lib/standard/file.nit

diff --cc lib/standard/file.nit
index 0d00cdd,4a9a722..b851876
--- 1/lib/standard/file.nit
--- 2/lib/standard/file.nit
+++ b/lib/standard/file.nit
@@@ -263,24 -240,12 +263,24 @@@ redef class Strin
        end
  
        # Extract the basename of a path and remove the extension
 +      #
 +      #     assert "/path/to/a_file.ext".basename(".ext")         == "a_file"
 +      #     assert "path/to/a_file.ext".basename(".ext")          == "a_file"
 +      #     assert "path/to".basename(".ext")                     == "to"
 +      #     assert "path/to/".basename(".ext")                    == "to"
 +      #     assert "path".basename("")                        == "path"
 +      #     assert "/path".basename("")                       == "path"
 +      #     assert "/".basename("")                           == "/"
 +      #     assert "".basename("")                            == ""
        fun basename(ext: String): String
        do
-               var l = _length - 1 # Index of the last char
 -              var pos = last_index_of_from('/', length - 1)
++              var l = length - 1 # Index of the last char
 +              while l > 0 and self.chars[l] == '/' do l -= 1 # remove all trailing `/`
 +              if l == 0 then return "/"
 +              var pos = last_index_of_from('/', l)
                var n = self
                if pos >= 0 then
 -                      n = substring_from(pos+1)
 +                      n = substring(pos+1, l-pos)
                end
                return n.strip_extension(ext)
        end
@@@ -297,8 -262,8 +297,8 @@@
        #     assert "".dirname                            == "."
        fun dirname: String
        do
-               var l = _length - 1 # Index of the last char
+               var l = length - 1 # Index of the last char
 -              if l > 0 and self.chars[l] == '/' then l -= 1 # remove trailing `/`
 +              while l > 0 and self.chars[l] == '/' do l -= 1 # remove all trailing `/`
                var pos = last_index_of_from('/', l)
                if pos > 0 then
                        return substring(0, pos)

diff --cc lib/standard/stream.nit
Simple merge

diff --cc lib/standard/string.nit
Simple merge

diff --cc src/global_compiler.nit
Simple merge

diff --cc src/metrics/generate_hierarchies.nit
Simple merge

diff --cc src/metrics/model_hyperdoc.nit
Simple merge

diff --cc src/model/model.nit
Simple merge

diff --cc src/naive_interpreter.nit
Simple merge

diff --cc src/network_debugger.nit
index cac7dd5,7fc38aa..7fc38aa
mode 100644,100755..100644
--- 1/src/network_debugger.nit
--- 2/src/network_debugger.nit
+++ b/src/network_debugger.nit

diff --cc src/nitdbg_client.nit
index 3b06cf5,c80e8c3..4b01ecd
mode 100644,100755..100644
--- 1/src/nitdbg_client.nit
--- 2/src/dbgcli.nit
+++ b/src/nitdbg_client.nit

diff --cc src/nitdoc.nit
Simple merge

diff --cc src/nitx.nit
Simple merge

diff --cc src/separate_compiler.nit
Simple merge