Fixe a bad merge
Merge branch 'master' of github.com:jpages/nit into vm