Merge branch 'master' into 6657-no-git-in-arv-copy
authorradhika <radhika@curoverse.com>
Wed, 29 Jul 2015 18:05:35 +0000 (14:05 -0400)
committerradhika <radhika@curoverse.com>
Wed, 29 Jul 2015 18:05:35 +0000 (14:05 -0400)

Trivial merge