Merge pull request #491 from TheBlueMatt/2020-02-one-conf-lock