Update for CB 1.5.2
Merge remote-tracking branch 'origin/master'