Merge pull request #228 from cloudedge/pull-req-master-ac82ac70f6519daa9e9c35d1a1384fdabe561489

https://github.com/crowbar/barclamp-network/pull/228

Merged by devtool for VictorLowther