Merge branch '6429-crunch2-api' closes #6429
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 14 Dec 2015 20:22:39 +0000 (15:22 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 14 Dec 2015 20:22:39 +0000 (15:22 -0500)

Trivial merge