remove .gitkeep from uploads folder
Merge branch 'master' into plugins