Merge branch 's3_crypto' of github.com:hualongfeng/fio