merge to master when available in boto upstream

When [this pull request gets merged in boto upstream](https://github.com/boto/boto/pull/2578) and is available, then merge this feature into the master branch.