See comments on commit 5ab85b0. Also fixed some bb typo's in docu index.
Merge remote-tracking branch 'upstream/master'