Merge pull request #1806 from rubenk/network-plugin-size_t