watch_data_log should flush after write
Merge pull request #232 from petercable/watch_data_log

watch_data_log should flush after write
Merge remote-tracking branch 'upstream/master' into massp
fix for unit test