Merge pull request #586 from bhariharan/unstable

Merge branch 'master' into unstable
Bug fix for network field name