Merge branch 'refs/heads/release-0.9.3'
Finish release-0.9.4
Finish release-0.9.5
Finish release-0.9.6
add timeout to recordtofile
Merge branch 'origin/master'