Merge pull request #224 from cloudedge/pull-req-master-818ff63843f8669dd6672b800daf568c7aff605f

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

Merged by devtool for VictorLowther