Merge branch 'master' into 8079-api-client-auth-uuid
authorradhika <radhika@curoverse.com>
Tue, 16 Feb 2016 01:46:05 +0000 (20:46 -0500)
committerradhika <radhika@curoverse.com>
Tue, 16 Feb 2016 01:46:05 +0000 (20:46 -0500)

Trivial merge