Pulled in master
Minor changes for S3