Merge branch 'master' into 8556-trash-untrash-azure-volume
authorradhika <radhika@curoverse.com>
Wed, 27 Apr 2016 21:38:02 +0000 (17:38 -0400)
committerradhika <radhika@curoverse.com>
Wed, 27 Apr 2016 21:38:02 +0000 (17:38 -0400)

Trivial merge