20130910 Fix conflicts and modify file send progress update time.