Merge branch '5016-ctrl-c-arv-ws' closes #5016
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 21 Jan 2015 15:51:51 +0000 (10:51 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 21 Jan 2015 15:51:51 +0000 (10:51 -0500)

Trivial merge