Merge forks
See
https://github.com/lemourin/libcloudstorage