Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/Net/Amazon/S3/Client/Object.pm
Merge remote-tracking branch 'upstream/develop'

No actual changes, just marking it as merged.
Same changes have been merged to this branch earlier.
Merge remote-tracking branch 'rustyconover/best-merge'