Now also creating uploads folder
Merge branch 'master' into 6.0