Autofarm: correct incorrect logic for determining if a farm is surface or subterranean
Merge branch 'master' into autolabor