ineiti Merge pull request #2499 from dedis/remove_external_nodes