Merge branch 'rs/plug-strbuf-leak-in-lock-ref'