Merge branch 'master' into 8556-trash-untrash-azure-volume
authorradhika <radhika@curoverse.com>
Sun, 1 May 2016 12:57:17 +0000 (08:57 -0400)
committerradhika <radhika@curoverse.com>
Sun, 1 May 2016 12:57:17 +0000 (08:57 -0400)

Trivial merge