Merge branch '9459-test_with_arvbox_tweaks'
authorNico Cesar <nico@curoverse.com>
Wed, 13 Jul 2016 21:18:52 +0000 (17:18 -0400)
committerNico Cesar <nico@curoverse.com>
Wed, 13 Jul 2016 21:19:20 +0000 (17:19 -0400)
refs #9459


Trivial merge