Merge pull request #1015 from jmaas/master

Get rid of the since 2.4 deprecated field 'subnet'.