Merge branch 'master' into 4887-invalidate-duplicate-ip-on-old-compute-nodes
authorWard Vandewege <ward@curoverse.com>
Wed, 31 Dec 2014 15:01:30 +0000 (10:01 -0500)
committerWard Vandewege <ward@curoverse.com>
Wed, 31 Dec 2014 15:01:30 +0000 (10:01 -0500)

Trivial merge