merge from boto/boto