Changed Floating IPs
Merge branch 'master' into basic