#268 - Fix for NRE in b2Joint construction.
Merge remote-tracking branch 'upstream/master'