Merge branch 'master' of https://github.com/privat/nit into nitdoc_merge