Be able to support setter-based injection
Merge branch 'master' into 0.3.bsb