locksmith: now with less crashing
Merge pull request #764 from marineam/bump

locksmith: now with less crashing