finish migrate to S3 for plugs and thumbs
Merge remote-tracking branch 'origin/master'