merge from boto/dev