Merge branch 'master' into osx_zuffy
remove fnOnProgress

remove  fnOnProgress timer
Merge branch 'osx_zuffy'