Changed names of BondGate site accessors to i1() and i2(), with guarantee that i1() < i2().
Merge branch 'master' into develop