Removed boto dependency
Merge branch 'master' into deployment