dwarflint merged, wiki updated