Merge pull request #258 from TheBlueMatt/2018-11-close-locked