Merge branch 's3-gold' into staging
Script upload -> 20140217104921
Merge branch 'master' into s3-gold