Merge branch '2986-arv-edit' closes #2986
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 23 Jun 2014 13:11:38 +0000 (09:11 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 23 Jun 2014 13:11:38 +0000 (09:11 -0400)

Trivial merge