Merge branch 'master' into rc

README.md

@@ -167,16 +167,15 @@ Check out my other plugins [here](https://plugins.octoprint.org/by_author/#jneil
 - [@Mearman](https://github.com/Mearman)
 - [@TheTuxKeeper](https://github.com/thetuxkeeper)
 - [@tideline3d](https://github.com/tideline3d/)
+- [OctoFarm](https://octofarm.net/)
 - [SimplyPrint](https://simplyprint.dk/)
 - [Andrew Beeman](https://github.com/Kiendeleo)
 - [Calanish](https://github.com/calanish)
-- [Will O](https://github.com/4wrxb)
 - [Lachlan Bell](https://lachy.io/)
 - [Johnny Bergdal](https://github.com/bergdahl)
 - [Leigh Johnson](https://github.com/leigh-johnson)
 - [Stephen Berry](https://github.com/berrystephenw)
 - [Guyot François](https://github.com/iFrostizz)
-- César Romero
 - [Steve Dougherty](https://github.com/Thynix)
 - [Kyle Menigoz](https://menigoz.me)
 ## Support My Efforts