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
commit 3129310ffc

@ -1 +1 @@
Subproject commit 1c07d5c78f07bf8a5dcc73c6f16f1b9743565b06
Subproject commit 41ade2f291c4596ac489606ca2b730b72b460dc2