Merge pull request #1074 from hypar-io/make-deserialization-thread-safe

Merge pull request #1074 from hypar-io/make-deserialization-thread-safe #505