am 358e152b: am e95262a8: (-s ours) am 847fdcf7: (-s ours) am 2f14418c: am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE
* commit '358e152b1081f0e74693651e9b5137bd6c2dbad6':main
commit
193fea55d9
* commit '358e152b1081f0e74693651e9b5137bd6c2dbad6':main