Merge branch '3609-arv-ws' refs #3609
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 16 Oct 2014 19:35:00 +0000 (15:35 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 16 Oct 2014 19:35:00 +0000 (15:35 -0400)

Trivial merge