Merge branch 'alexei-matveev-master'
BL: update bgy3d module
AM: FIX WITH_BGY3D build, import i4_kind as well
AM: rm unused argument
AM: add protected attribute