Bug 921721 - Use settingsLock.closed
Merge pull request #13154 from gregorwagner/settings3

Bug 921721 - Use settingsLock.closed. r=timdream