Update upstream CB

Closes GH-556
This commit is contained in:
Zach Brown
2016-12-27 18:46:41 -06:00
parent 498c673952
commit d6b19bb3c8