Rivet-the-Zombie Merge pull request CleverRaven#24001 from Vasyan2006/dairy-farm

Bugfixes for dairy farms.

Latest commit 63ff4d3

Jun 15, 2018