Merge pull request #233 from TheBlueMatt/2018-10-shutdown-updates