Fix farming unloaded node crash
Merge remote-tracking branch 'upstream/master'