Quick change so there is no need to include the Forestry API in the
released version.
Merge remote-tracking branch 'origin/master'