Recent odds and ends.
Merge branch 'master' of github.com:scztt/FORESTRY