Merge branch 'master' into devbranch
removes query params on s3 files
Merge branch 'devbranch'