0.2.25:big file uploads add os if
Merge remote-tracking branch 'origin/master'