Merge branch 'nitdoc'