Fix timestamp concurrency bug, issue 285
Merge branch 'master' of github.com:LyonsLab/coge