just merged in parts of farmbot-controller