Specify BSL differently.

Somehow this avoids a conflict between the image? bindings in BSL and in
the image teachpack.
Merge branch 'master' into deploy-test