Some locks on dump
Merge remote-tracking branch 'origin/master'
std::io is thread safed now
Merge remote-tracking branch 'upstream/master'