Merge branch 'master' into 3699-arv-copy
authorTim Pierce <twp@curoverse.com>
Thu, 25 Sep 2014 15:09:04 +0000 (11:09 -0400)
committerTim Pierce <twp@curoverse.com>
Thu, 25 Sep 2014 15:09:04 +0000 (11:09 -0400)

Trivial merge