Merge branch '3609-arv-ws' into 3609-arv-run
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 16 Oct 2014 17:21:01 +0000 (13:21 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 16 Oct 2014 17:21:01 +0000 (13:21 -0400)

Trivial merge