Merge pull request #2565 from danielnorberg/master

lock around read operations in graph