Merge branch 'master' into 7546-put-retry
authorradhika <radhika@curoverse.com>
Thu, 22 Oct 2015 19:24:43 +0000 (15:24 -0400)
committerradhika <radhika@curoverse.com>
Thu, 22 Oct 2015 19:24:43 +0000 (15:24 -0400)

Trivial merge