Merge branch 'master' into 8561-node-pairing
authorradhika <radhika@curoverse.com>
Wed, 16 Mar 2016 19:46:38 +0000 (15:46 -0400)
committerradhika <radhika@curoverse.com>
Wed, 16 Mar 2016 19:46:38 +0000 (15:46 -0400)

Trivial merge