Updated bundle. Using AWS for tests.
Merge branch 'master' into staging