Merge branch 'master' into 6657-no-git-in-arv-copy
authorradhika <radhika@curoverse.com>
Tue, 28 Jul 2015 19:28:44 +0000 (15:28 -0400)
committerradhika <radhika@curoverse.com>
Tue, 28 Jul 2015 19:28:44 +0000 (15:28 -0400)

Trivial merge