Merge branch 'master' into 8079-api-client-auth-uuid
authorradhika <radhika@curoverse.com>
Mon, 15 Feb 2016 13:40:54 +0000 (08:40 -0500)
committerradhika <radhika@curoverse.com>
Mon, 15 Feb 2016 13:40:54 +0000 (08:40 -0500)

Trivial merge