Merge branch 'arvbox-fixes' no issue #
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 25 Feb 2016 16:16:20 +0000 (11:16 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 25 Feb 2016 16:16:20 +0000 (11:16 -0500)

Trivial merge