some cleanup
Merge branch 'master' into s3_auth