Merge remote-tracking branch 'maggieqi/master'
Merge remote-tracking branch 'upstream/master'
Get workers' log back.
Merge pull request #196 from fegin/master

Get workers' log back