improved thread safety
Merge remote-tracking branch 'sitecore/master'