Automation is finally in a workable state (I think).  Time to merge this
branch and start anew on the other features for this release...