Merge pull request #525 from jamierocks/pr/update-cb

Update upstream CB
This commit is contained in:
Zach Brown
2016-11-29 14:29:34 -06:00