Merge branch '4924-arv-edit-error-handling' closes #4924
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 12 Jan 2015 18:39:34 +0000 (13:39 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 12 Jan 2015 18:39:34 +0000 (13:39 -0500)

Trivial merge