fix build script; add explicit scope to bindings
Merge remote-tracking branch 'upstream/develop' into develop