Fix running with Forestry but not BC.
Merge branch 'master' into development