Use correct ipaddr gem version
Merge branch 'develop'