Merge branch '6520-skip-compute0' refs #6520
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 16 Feb 2017 21:34:00 +0000 (16:34 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 16 Feb 2017 21:34:00 +0000 (16:34 -0500)

Trivial merge