fixed datathread lock problem (issue #272)
forgot to return
Merge branch 'nightly'