Merge branch 'master' into 8198-node-ip-address
authorradhika <radhika@curoverse.com>
Tue, 26 Jan 2016 17:09:37 +0000 (12:09 -0500)
committerradhika <radhika@curoverse.com>
Tue, 26 Jan 2016 17:09:37 +0000 (12:09 -0500)

Trivial merge