Merge pull request #119 from alanedwardes/master

The S3 object name is no longer generated twice, previously resulting in...