Aws update

Merged Spencer Sutton requested to merge aws-update into master

Merge request reports