Adding changes from https://github.com/franc-carter/boto